floraachy
/
console
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixed alerting bug

This commit is contained in:
liugq 2022-05-25 16:40:07 +08:00
parent e1471378ce
commit e72f0e940a
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
service/alerting/elasticsearch/engine.go
View File

@ -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{ queryDsl := util.MapStr{
"size": 1, "size": 1,
"sort": []util.MapStr{ "sort": []util.MapStr{
@ -966,13 +966,15 @@ func getLastAlertMessageFromES(ruleID string, message *alerting.AlertMessage) e
} }
err, searchResult := orm.Search(alerting.AlertMessage{}, &q ) err, searchResult := orm.Search(alerting.AlertMessage{}, &q )
if err != nil { if err != nil {
return err return nil, err
} }
if len(searchResult.Result) == 0 { if len(searchResult.Result) == 0 {
return nil return nil, nil
} }
messageBytes := util.MustToJSONBytes(searchResult.Result[0]) 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 ){ 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 return message, nil
} }
} }
err = getLastAlertMessageFromES(ruleID, message) message, err = getLastAlertMessageFromES(ruleID)
return message, err return message, err
} }