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