From 5e054a25ad1fd732c30966268ab4a129da0c9a93 Mon Sep 17 00:00:00 2001 From: zhaoxiangchun <1422928955@qq.com> Date: Mon, 4 Jan 2021 15:37:31 +0800 Subject: [PATCH] fix(monitor): modify totalrecord query MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 1. influxdb 增加abs function 2. 调整total报警记录接口query --- pkg/monitor/models/alertrecord.go | 1 + pkg/monitor/tsdb/driver/influxdb/query_part.go | 1 + 2 files changed, 2 insertions(+) diff --git a/pkg/monitor/models/alertrecord.go b/pkg/monitor/models/alertrecord.go index d82373103f..01e377924b 100644 --- a/pkg/monitor/models/alertrecord.go +++ b/pkg/monitor/models/alertrecord.go @@ -335,6 +335,7 @@ func (manager *SAlertRecordManager) getNowAlertingRecord(ctx context.Context, us scope, _ := param.GetString("scope") query = manager.FilterByOwner(query, userCred, rbacutils.String2Scope(scope)) query = query.GE("created_at", startTime.UTC().Format(timeutils.MysqlTimeFormat)) + query = query.Equals("state", monitor.AlertStateAlerting) sQuery := CommonAlertManager.Query("id").Equals("state", monitor.AlertStateAlerting).IsNull("used_by").SubQuery() query = query.In("alert_id", sQuery).IsNotNull("res_type").IsNotEmpty("res_type").GroupBy("alert_id") records := make([]SAlertRecord, 0) diff --git a/pkg/monitor/tsdb/driver/influxdb/query_part.go b/pkg/monitor/tsdb/driver/influxdb/query_part.go index c630814c4c..f947bf44b5 100644 --- a/pkg/monitor/tsdb/driver/influxdb/query_part.go +++ b/pkg/monitor/tsdb/driver/influxdb/query_part.go @@ -95,6 +95,7 @@ func init() { renders["last"] = QueryDefinition{Renderer: functionRenderer} renders["max"] = QueryDefinition{Renderer: functionRenderer} renders["min"] = QueryDefinition{Renderer: functionRenderer} + renders["abs"] = QueryDefinition{Renderer: functionRenderer} renders["percentile"] = QueryDefinition{ Renderer: functionRenderer, Params: []DefinitionParameters{{Name: "nth", Type: "int"}},