From 91d1f64eff56dafe4a7c0919046148b361376c62 Mon Sep 17 00:00:00 2001
From: zhaoxiangchun <1422928955@qq.com>
Date: Tue, 24 Nov 2020 12:10:27 +0800
Subject: [PATCH] fix(monitor): modify suggestrule process influxdb data
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

1. 调整与监控相关的时间范围的判断逻辑：不再要求时间范围内必须都有数据
---
 pkg/monitor/alerting/conditions/suggestrulereducer.go | 4 ++--
 pkg/monitor/models/suggestsysrule.go                  | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkg/monitor/alerting/conditions/suggestrulereducer.go b/pkg/monitor/alerting/conditions/suggestrulereducer.go
index b884c48209..d17aff13c3 100644
--- a/pkg/monitor/alerting/conditions/suggestrulereducer.go
+++ b/pkg/monitor/alerting/conditions/suggestrulereducer.go
@@ -33,8 +33,8 @@ func NewSuggestRuleReducer(t string, duration time.Duration) Reducer {
 }
 
 func (s *suggestRuleReducer) Reduce(series *tsdb.TimeSeries) (*float64, []string) {
-	if int(s.duration.Seconds()) > len(series.Points) {
+	/*if int(s.duration.Seconds()) > len(series.Points) {
 		return nil, nil
-	}
+	}*/
 	return s.queryReducer.Reduce(series)
 }
diff --git a/pkg/monitor/models/suggestsysrule.go b/pkg/monitor/models/suggestsysrule.go
index 4e6a007269..d352645538 100644
--- a/pkg/monitor/models/suggestsysrule.go
+++ b/pkg/monitor/models/suggestsysrule.go
@@ -672,19 +672,19 @@ func showDuration(dur string) string {
 func showDuration_(dur int64, sign string) string {
 	var durUp, durSign int64
 	var upSign, durStr string
-	if sign == "s" && dur > 60 {
+	if sign == "s" && dur >= 60 {
 		upSign = "m"
 		durUp = dur / 60
 		durSign = dur % 60
 		durStr = showDuration_(durUp, upSign)
 	}
-	if sign == "m" && dur > 60 {
+	if sign == "m" && dur >= 60 {
 		upSign = "h"
 		durUp = dur / 60
 		durSign = dur % 60
 		durStr = showDuration_(durUp, upSign)
 	}
-	if sign == "h" && dur > 24 {
+	if sign == "h" && dur >= 24 {
 		upSign = "d"
 		durUp = dur / 24
 		durSign = dur % 24