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

rename severity to priority

This commit is contained in:
liugq 2022-07-13 09:22:31 +08:00
parent 6cea3bcaf7
commit 0f1074ee60
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -108,9 +108,9 @@ func (h *AlertAPI) getAlertMessageStats(w http.ResponseWriter, req *http.Request
}, },
}, },
"aggs": util.MapStr{ "aggs": util.MapStr{
"terms_by_severity": util.MapStr{ "terms_by_priority": util.MapStr{
"terms": util.MapStr{ "terms": util.MapStr{
"field": "severity", "field": "priority",
"size": 5, "size": 5,
}, },
}, },
@ -125,7 +125,7 @@ func (h *AlertAPI) getAlertMessageStats(w http.ResponseWriter, req *http.Request
return return
} }
statusCounts := map[string]interface{}{} statusCounts := map[string]interface{}{}
if termsAgg, ok := searchRes.Aggregations["terms_by_severity"]; ok { if termsAgg, ok := searchRes.Aggregations["terms_by_priority"]; ok {
for _, bk := range termsAgg.Buckets { for _, bk := range termsAgg.Buckets {
if status, ok := bk["key"].(string); ok { if status, ok := bk["key"].(string); ok {
statusCounts[status] = bk["doc_count"] statusCounts[status] = bk["doc_count"]
@ -173,9 +173,9 @@ func (h *AlertAPI) searchAlertMessage(w http.ResponseWriter, req *http.Request,
queryDSL = `{"sort":[%s],"query":{"bool":{"must":[%s]}}, "size": %d, "from": %d}` queryDSL = `{"sort":[%s],"query":{"bool":{"must":[%s]}}, "size": %d, "from": %d}`
strSize = h.GetParameterOrDefault(req, "size", "20") strSize = h.GetParameterOrDefault(req, "size", "20")
strFrom = h.GetParameterOrDefault(req, "from", "0") strFrom = h.GetParameterOrDefault(req, "from", "0")
status = h.GetParameterOrDefault(req, "status", "") status = h.GetParameterOrDefault(req, "status", "")
severity = h.GetParameterOrDefault(req, "severity", "") priority = h.GetParameterOrDefault(req, "priority", "")
sort = h.GetParameterOrDefault(req, "sort", "") sort = h.GetParameterOrDefault(req, "sort", "")
ruleID = h.GetParameterOrDefault(req, "rule_id", "") ruleID = h.GetParameterOrDefault(req, "rule_id", "")
min = h.GetParameterOrDefault(req, "min", "now-30d") min = h.GetParameterOrDefault(req, "min", "now-30d")
max = h.GetParameterOrDefault(req, "max", "now") max = h.GetParameterOrDefault(req, "max", "now")
@ -208,9 +208,9 @@ func (h *AlertAPI) searchAlertMessage(w http.ResponseWriter, req *http.Request,
mustBuilder.WriteString(",") mustBuilder.WriteString(",")
mustBuilder.WriteString(fmt.Sprintf(`{"term":{"status":{"value":"%s"}}}`, status)) mustBuilder.WriteString(fmt.Sprintf(`{"term":{"status":{"value":"%s"}}}`, status))
} }
if severity != "" { if priority != "" {
mustBuilder.WriteString(",") mustBuilder.WriteString(",")
mustBuilder.WriteString(fmt.Sprintf(`{"term":{"severity":{"value":"%s"}}}`, severity)) mustBuilder.WriteString(fmt.Sprintf(`{"term":{"priority":{"value":"%s"}}}`, priority))
} }
size, _ := strconv.Atoi(strSize) size, _ := strconv.Atoi(strSize)
if size <= 0 { if size <= 0 {
@ -302,7 +302,7 @@ func (h *AlertAPI) getAlertMessage(w http.ResponseWriter, req *http.Request, ps
"rule_enabled": rule.Enabled, "rule_enabled": rule.Enabled,
"title": message.Title, "title": message.Title,
"message": message.Message, "message": message.Message,
"severity": message.Priority, "priority": message.Priority,
"created": message.Created, "created": message.Created,
"updated": message.Updated, "updated": message.Updated,
"resource_name": rule.Resource.Name, "resource_name": rule.Resource.Name,