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

remove default time filter with alert message search api

This commit is contained in:
liugq 2023-08-31 15:25:45 +08:00
parent a318284075
commit d738d1985e
1 changed files with 32 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -230,21 +230,49 @@ func (h *AlertAPI) getAlertMessageStats(w http.ResponseWriter, req *http.Request
func (h *AlertAPI) searchAlertMessage(w http.ResponseWriter, req *http.Request, ps httprouter.Params) { func (h *AlertAPI) searchAlertMessage(w http.ResponseWriter, req *http.Request, ps httprouter.Params) {
var ( var (
queryDSL = `{"sort":[%s],"query":{"bool":{"must":[%s]}}, "size": %d, "from": %d}` queryDSL = `{"sort":[%s],"query":{"bool":{"must":[%s]}}, "size": %d, "from": %d,"aggs": {
"max_updated": {
"max": {
"field": "updated"
}
},
"min_updated": {
"min": {
"field": "updated"
}
}
}}`
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", "")
priority = h.GetParameterOrDefault(req, "priority", "") 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", "")
max = h.GetParameterOrDefault(req, "max", "now") max = h.GetParameterOrDefault(req, "max", "")
mustBuilder = &strings.Builder{} mustBuilder = &strings.Builder{}
sortBuilder = strings.Builder{} sortBuilder = strings.Builder{}
category = h.GetParameterOrDefault(req, "category", "") category = h.GetParameterOrDefault(req, "category", "")
tags = h.GetParameterOrDefault(req, "tags", "") tags = h.GetParameterOrDefault(req, "tags", "")
) )
mustBuilder.WriteString(fmt.Sprintf(`{"range":{"created":{"gte":"%s", "lte": "%s"}}}`, min, max)) timeRange := util.MapStr{}
if min != "" {
timeRange["gte"] = min
}
if max != "" {
timeRange["lte"] = max
}
if len(timeRange) > 0 {
timeFilter := util.MapStr{
"range": util.MapStr{
"updated": timeRange,
},
}
mustBuilder.Write(util.MustToJSONBytes(timeFilter))
}else{
mustBuilder.WriteString(`{"match_all":{}}`)
}
if ruleID != "" { if ruleID != "" {
mustBuilder.WriteString(fmt.Sprintf(`,{"term":{"rule_id":{"value":"%s"}}}`, ruleID)) mustBuilder.WriteString(fmt.Sprintf(`,{"term":{"rule_id":{"value":"%s"}}}`, ruleID))
} }