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

get event message list with default order by updated

This commit is contained in:
liugq 2023-08-29 16:00:44 +08:00
parent df477c1485
commit 74415b97e7
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
plugin/api/alerting/message.go
View File

@ -260,11 +260,11 @@ func (h *AlertAPI) searchAlertMessage(w http.ResponseWriter, req *http.Request,
if sort != "" { if sort != "" {
sortParts := strings.Split(sort, ",") sortParts := strings.Split(sort, ",")
if len(sortParts) == 2 && sortParts[1] != "created" { if len(sortParts) == 2 && sortParts[1] != "updated" {
sortBuilder.WriteString(fmt.Sprintf(`{"%s":{ "order": "%s"}},`, sortParts[0], sortParts[1])) sortBuilder.WriteString(fmt.Sprintf(`{"%s":{ "order": "%s"}},`, sortParts[0], sortParts[1]))
} }
} }
sortBuilder.WriteString(`{"created":{ "order": "desc"}}`) sortBuilder.WriteString(`{"updated":{ "order": "desc"}}`)
if status != "" { if status != "" {
mustBuilder.WriteString(",") mustBuilder.WriteString(",")

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

@ -671,7 +671,7 @@ func (engine *Engine) Do(rule *alerting.Rule) error {
conditionResults := checkResults.ResultItems conditionResults := checkResults.ResultItems
var paramsCtx map[string]interface{} var paramsCtx map[string]interface{}
if len(conditionResults) == 0 { if len(conditionResults) == 0 {
alertItem.Priority = "info" alertItem.Priority = ""
if checkResults.QueryResult.Nodata { if checkResults.QueryResult.Nodata {
alertItem.State = alerting.AlertStateNodata alertItem.State = alerting.AlertStateNodata
} }