From e72f0e940a7bf4817f93212fc4433ca10dfbc544 Mon Sep 17 00:00:00 2001
From: liugq <silenceqi@hotmail.com>
Date: Wed, 25 May 2022 16:40:07 +0800
Subject: [PATCH] fixed alerting bug

---
 service/alerting/elasticsearch/engine.go | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/service/alerting/elasticsearch/engine.go b/service/alerting/elasticsearch/engine.go
index df6efca0..62d1c708 100644
--- a/service/alerting/elasticsearch/engine.go
+++ b/service/alerting/elasticsearch/engine.go
@@ -943,7 +943,7 @@ func collectMetricData(agg interface{}, groupValues string, metricData *[]alerti
 	}
 }
 
-func getLastAlertMessageFromES(ruleID string, message *alerting.AlertMessage)  error {
+func getLastAlertMessageFromES(ruleID string) (*alerting.AlertMessage, error) {
 	queryDsl := util.MapStr{
 		"size": 1,
 		"sort": []util.MapStr{
@@ -966,13 +966,15 @@ func getLastAlertMessageFromES(ruleID string, message *alerting.AlertMessage)  e
 	}
 	err, searchResult := orm.Search(alerting.AlertMessage{}, &q )
 	if err != nil {
-		return  err
+		return  nil, err
 	}
 	if len(searchResult.Result) == 0 {
-		return  nil
+		return  nil, nil
 	}
 	messageBytes := util.MustToJSONBytes(searchResult.Result[0])
-	return util.FromJSONBytes(messageBytes, message)
+	message := &alerting.AlertMessage{}
+	err =  util.FromJSONBytes(messageBytes, message)
+	return message, err
 }
 
 func getLastAlertMessage(ruleID string, duration time.Duration) (*alerting.AlertMessage, error ){
@@ -991,7 +993,7 @@ func getLastAlertMessage(ruleID string, duration time.Duration) (*alerting.Alert
 			return message, nil
 		}
 	}
-	err = getLastAlertMessageFromES(ruleID, message)
+	message, err = getLastAlertMessageFromES(ruleID)
 	return message, err
 }