From 72244b1983e0090379340ebe7544403bc4496f8c Mon Sep 17 00:00:00 2001 From: ning1875 <907974064@qq.com> Date: Mon, 2 Aug 2021 17:37:55 +0800 Subject: [PATCH] 1. remove some todo (#755) --- backend/prome/query.go | 3 --- judge/prome_pull.go | 7 +++---- judge/query.go | 1 - 3 files changed, 3 insertions(+), 8 deletions(-) diff --git a/backend/prome/query.go b/backend/prome/query.go index ef6dca9a..132c8bc5 100644 --- a/backend/prome/query.go +++ b/backend/prome/query.go @@ -223,7 +223,6 @@ func (pd *PromeDataSource) QueryData(inputs vos.DataQueryParam) []*vos.DataQuery } ctx, _ := context.WithTimeout(context.Background(), time.Second*30) res := q.Exec(ctx) - // TODO 将err返回给前端 if res.Err != nil { logger.Errorf("[prome_query_error][rangeQuery_exec_error][args:%+v][err:%+v]", input, res.Err) q.Close() @@ -251,7 +250,6 @@ func (pd *PromeDataSource) QueryData(inputs vos.DataQueryParam) []*vos.DataQuery name := m.Metric.Get(LABEL_NAME) oneResp.Metric = name oneResp.Ident = ident - // TODO 去掉point num pNum := len(m.Points) interval := int64(resolution / time.Second) pNumExpect := int((inputs.End - inputs.Start) / interval) @@ -391,7 +389,6 @@ func (pd *PromeDataSource) CommonQuerySeries(cj *commonQueryObj) storage.SeriesS // TODO 等待prometheus官方对 remote_read label_values 的支持 // Implement: https://github.com/prometheus/prometheus/issues/3351 func (pd *PromeDataSource) QueryTagKeys(recv vos.CommonTagQueryParam) *vos.TagKeyQueryResp { - // TODO 完成标签匹配模式 respD := &vos.TagKeyQueryResp{ Keys: make([]string, 0), } diff --git a/judge/prome_pull.go b/judge/prome_pull.go index b69857af..45c58787 100644 --- a/judge/prome_pull.go +++ b/judge/prome_pull.go @@ -168,10 +168,9 @@ func handlePromqlVector(pv promql.Vector, r models.AlertRule) { logger.Debugf("[proml.historyArr][metricsName:%v][Tags:%v]\n", metricsName, tagm) event := &models.AlertEvent{ - RuleId: r.Id, - RuleName: r.Name, - RuleNote: r.Note, - // TODO for expr 这些信息变化 hashid 也要变, + RuleId: r.Id, + RuleName: r.Name, + RuleNote: r.Note, HashId: hashId, IsPromePull: 1, IsRecovery: 0, diff --git a/judge/query.go b/judge/query.go index e0077035..15103c37 100644 --- a/judge/query.go +++ b/judge/query.go @@ -38,7 +38,6 @@ func Query(reqs *vos.DataQueryParam) []*vos.HPoint { return hisD } logger.Debugf("[reqs:%+v][queryResD:%+v]\n", reqs, queryResD[0]) - // TODO 如何判断查询到的多条曲线? 与条件希望都是配置时就是一条曲线 fD := queryResD[0] var values vos.HistoryDataS