fix(monitor): modify suggestrule process influxdb data

1. 调整与监控相关的时间范围的判断逻辑:不再要求时间范围内必须都有数据
This commit is contained in:
zhaoxiangchun
2020-11-24 17:45:47 +08:00
parent 3192b9a06f
commit 91d1f64eff
2 changed files with 5 additions and 5 deletions
@@ -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)
}
+3 -3
View File
@@ -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