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

rewrite alert channel search api

This commit is contained in:
liugq 2023-08-05 18:15:56 +08:00
parent 90dc208fb7
commit d7f04395fd
1 changed files with 36 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
plugin/api/alerting/channel.go
View File

@ -12,7 +12,6 @@ import (
"infini.sh/framework/core/global" "infini.sh/framework/core/global"
"net/http" "net/http"
"strconv" "strconv"
"strings"
"time" "time"
log "github.com/cihub/seelog" log "github.com/cihub/seelog"
@ -187,13 +186,34 @@ func (h *AlertAPI) searchChannel(w http.ResponseWriter, req *http.Request, ps ht
var ( var (
keyword = h.GetParameterOrDefault(req, "keyword", "") keyword = h.GetParameterOrDefault(req, "keyword", "")
queryDSL = `{"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")
mustBuilder = &strings.Builder{} subType = h.GetParameterOrDefault(req, "sub_type", "")
typ = h.GetParameterOrDefault(req, "type", "")
) )
mustQ := []interface{}{}
if keyword != "" { if keyword != "" {
mustBuilder.WriteString(fmt.Sprintf(`{"query_string":{"default_field":"*","query": "%s"}}`, keyword)) mustQ = append(mustQ, util.MapStr{
"query_string": util.MapStr{"default_field":"*","query": keyword},
})
}
if typ != "" {
mustQ = append(mustQ, util.MapStr{
"term": util.MapStr{
"type": util.MapStr{
"value": typ,
},
},
})
}
if subType != "" {
mustQ = append(mustQ, util.MapStr{
"term": util.MapStr{
"sub_type": util.MapStr{
"value": subType,
},
},
})
} }
size, _ := strconv.Atoi(strSize) size, _ := strconv.Atoi(strSize)
if size <= 0 { if size <= 0 {
@ -203,10 +223,19 @@ func (h *AlertAPI) searchChannel(w http.ResponseWriter, req *http.Request, ps ht
if from < 0 { if from < 0 {
from = 0 from = 0
} }
query := util.MapStr{
"size": size,
"from": from,
"query": util.MapStr{
"bool": util.MapStr{
"must": mustQ,
},
},
}
q := orm.Query{} q := orm.Query{
queryDSL = fmt.Sprintf(queryDSL, mustBuilder.String(), size, from) RawQuery: util.MustToJSONBytes(query),
q.RawQuery = []byte(queryDSL) }
err, res := orm.Search(&alerting.Channel{}, &q) err, res := orm.Search(&alerting.Channel{}, &q)
if err != nil { if err != nil {