opensource/cloudpods
3
0
Fork 0
mirror of https://github.com/yunionio/cloudpods.git synced 2026-09-19 02:37:24 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix(monitor): threshold_range message (#23855)

Browse Source
This commit is contained in:
Zexi Li
2025-11-27 16:47:24 +08:00
committed by GitHub
parent 4a7b6af08a
commit 8622137834
1 changed files with 16 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/monitor/alerting/conditions/query.go
+16 -1
View File
@@ -24,6 +24,7 @@ import (
"yunion.io/x/log"
"yunion.io/x/pkg/errors"
"yunion.io/x/pkg/util/sets"
"yunion.io/x/pkg/utils"
"yunion.io/x/onecloud/pkg/apis/monitor"
"yunion.io/x/onecloud/pkg/hostman/hostinfo/hostconsts"
@@ -327,8 +328,22 @@ func (c *QueryCondition) NewEvalMatch(
c.FetchCustomizeEvalMatch(context, evalMatch, alertDetails)
//c.newRuleDescription(context, alertDetails)
//evalMatch.Condition = c.GenerateFormatCond(meta, queryKeyInfo).String()
var thresholdStr string
// 处理 ranged types (within_range, outside_range)
if utils.IsInStringArray(alertDetails.Comparator, validators.EvaluatorRangedTypes) {
if len(alertDetails.ThresholdRange) >= 2 {
lowerStr := models.RationalizeValueFromUnit(alertDetails.ThresholdRange[0], evalMatch.Unit, "")
upperStr := models.RationalizeValueFromUnit(alertDetails.ThresholdRange[1], evalMatch.Unit, "")
thresholdStr = fmt.Sprintf("[%s, %s]", lowerStr, upperStr)
} else {
thresholdStr = models.RationalizeValueFromUnit(alertDetails.Threshold, evalMatch.Unit, "")
}
} else {
// 处理默认 types (gt, lt, eq)
thresholdStr = models.RationalizeValueFromUnit(alertDetails.Threshold, evalMatch.Unit, "")
}
msg := fmt.Sprintf("%s.%s %s %s", alertDetails.Measurement, alertDetails.Field,
alertDetails.Comparator, models.RationalizeValueFromUnit(alertDetails.Threshold, evalMatch.Unit, ""))
alertDetails.Comparator, thresholdStr)
if len(context.Rule.Message) == 0 {
context.Rule.Message = msg
}