From 649962685488283c77d6893586c61c8ea239d0ce Mon Sep 17 00:00:00 2001 From: medcl Date: Fri, 14 Oct 2022 20:49:13 +0800 Subject: [PATCH 1/2] fix filter module --- main.go | 2 -- 1 file changed, 2 deletions(-) diff --git a/main.go b/main.go index 3145e2bf..f481e8e4 100644 --- a/main.go +++ b/main.go @@ -19,7 +19,6 @@ import ( "infini.sh/framework/modules/agent" _ "infini.sh/framework/modules/api" elastic2 "infini.sh/framework/modules/elastic" - "infini.sh/framework/modules/filter" "infini.sh/framework/modules/metrics" "infini.sh/framework/modules/pipeline" queue2 "infini.sh/framework/modules/queue/disk_queue" @@ -67,7 +66,6 @@ func main() { } //load core modules first - module.RegisterSystemModule(&filter.FilterModule{}) module.RegisterSystemModule(&elastic2.ElasticModule{}) module.RegisterSystemModule(&stats.SimpleStatsModule{}) module.RegisterSystemModule(&queue2.DiskQueue{}) From 8741742ec73b235b4c3f24cc3e087454d6f926ea Mon Sep 17 00:00:00 2001 From: liugq Date: Fri, 14 Oct 2022 21:43:37 +0800 Subject: [PATCH 2/2] update elastic count api --- plugin/api/alerting/message.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugin/api/alerting/message.go b/plugin/api/alerting/message.go index 188d0efc..ae98e2cb 100644 --- a/plugin/api/alerting/message.go +++ b/plugin/api/alerting/message.go @@ -151,7 +151,7 @@ func (h *AlertAPI) getAlertMessageStats(w http.ResponseWriter, req *http.Request }, }, } - countRes, err := esClient.Count(indexName, util.MustToJSONBytes(queryDsl)) + countRes, err := esClient.Count(nil, indexName, util.MustToJSONBytes(queryDsl)) if err != nil { h.WriteJSON(w, util.MapStr{ "error": err.Error(),