opensource/cloudpods
3
0
Fork 0
mirror of https://github.com/yunionio/cloudpods.git synced 2026-10-24 23:41:52 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #8926 from zhaoxiangchun/bugfix/zxc-suggest-timefromj-master

Browse Source 
fix(monitor): modify suggestrule  process influxdb data
This commit is contained in:
yunion-ci-robot
2020-11-24 21:28:14 +08:00
committed by GitHub
parent dc3e2a7b24 91d1f64eff
commit 6c00313a01
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/monitor/alerting/conditions/suggestrulereducer.go
+2 -2
View File
@@ -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)
}
pkg/monitor/models/suggestsysrule.go
+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