From c3b5366a366db502bfd0c53c60920cf9204682d8 Mon Sep 17 00:00:00 2001
From: Noah Hilverling <noah.hilverling@icinga.com>
Date: Mon, 4 Nov 2019 13:56:05 +0100
Subject: [PATCH] History: Fix panic on acknowledgement comment expiry

---
 configobject/history/history.go | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/configobject/history/history.go b/configobject/history/history.go
index cafb3d41..f8bdc72d 100644
--- a/configobject/history/history.go
+++ b/configobject/history/history.go
@@ -316,7 +316,11 @@ func commentHistoryWorker(super *supervisor.Supervisor) {
 			case "comment_add":
 				eventTime = values["entry_time"].(string)
 			case "comment_remove":
-				eventTime = values["remove_time"].(string)
+				if values["remove_time"] != nil {
+					eventTime = values["remove_time"].(string)
+				} else {
+					eventTime = values["expire_time"].(string)
+				}
 			}
 
 			data := []interface{}{