opensource/cloudpods
3
0
Fork 0
mirror of https://github.com/yunionio/cloudpods.git synced 2026-09-01 15:07:17 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix(mointor): multiple duplicated message (#20892)

Browse Source
This commit is contained in:
Zexi Li
2024-07-25 15:27:09 +08:00
committed by GitHub
parent e569326b83
commit ecd0596147
3 changed files with 16 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/monitor/alerting/conditions/nodataquery.go
+1 -1
View File
@@ -79,7 +79,7 @@ serLoop:
}
reducedValue, valStrArr := c.Reducer.Reduce(series)
match, err := c.NewEvalMatch(context, *series, nil, reducedValue, valStrArr)
match, err := c.NewEvalMatch(context, *series, nil, reducedValue, valStrArr, false)
if err != nil {
return nil, errors.Wrap(err, "NoDataQueryCondition NewEvalMatch error")
}
pkg/monitor/alerting/conditions/query.go
+14 -8
View File
@@ -23,6 +23,7 @@ import (
"yunion.io/x/jsonutils"
"yunion.io/x/log"
"yunion.io/x/pkg/errors"
"yunion.io/x/pkg/util/sets"
"yunion.io/x/onecloud/pkg/apis/monitor"
"yunion.io/x/onecloud/pkg/hostman/hostinfo/hostconsts"
@@ -192,14 +193,14 @@ func (c *QueryCondition) Eval(context *alerting.EvalContext) (*alerting.Conditio
meta = &metas[0]
}
if evalMatch {
match, err := c.NewEvalMatch(context, *series, meta, reducedValue, valStrArr)
match, err := c.NewEvalMatch(context, *series, meta, reducedValue, valStrArr, evalMatch)
if err != nil {
return nil, errors.Wrap(err, "NewEvalMatch error")
}
matches = append(matches, match)
}
if reducedValue != nil && !evalMatch {
match, err := c.NewEvalMatch(context, *series, meta, reducedValue, valStrArr)
match, err := c.NewEvalMatch(context, *series, meta, reducedValue, valStrArr, evalMatch)
if err != nil {
return nil, errors.Wrap(err, "NewEvalMatch error")
}
@@ -278,8 +279,7 @@ func (c *QueryCondition) FillSerieByResourceField(resource jsonutils.JSONObject,
}
}
func (c *QueryCondition) NewEvalMatch(context *alerting.EvalContext, series monitor.TimeSeries,
meta *monitor.QueryResultMeta, value *float64, valStrArr []string) (*monitor.EvalMatch, error) {
func (c *QueryCondition) NewEvalMatch(context *alerting.EvalContext, series monitor.TimeSeries, meta *monitor.QueryResultMeta, value *float64, valStrArr []string, isMatch bool) (*monitor.EvalMatch, error) {
evalMatch := new(monitor.EvalMatch)
alertDetails, err := c.GetCommonAlertDetails(context)
if err != nil {
@@ -309,11 +309,17 @@ func (c *QueryCondition) NewEvalMatch(context *alerting.EvalContext, series moni
if len(context.Rule.Message) == 0 {
context.Rule.Message = msg
}
op := alertDetails.Operator
if op != "" && c.Index > 0 {
msg = fmt.Sprintf("%s %s", strings.ToUpper(op), msg)
// 避免重复指标
if isMatch {
op := alertDetails.Operator
if op != "" && c.Index > 0 {
msg = fmt.Sprintf("%s %s", strings.ToUpper(op), msg)
}
msgSet := sets.NewString(context.Rule.TriggeredMessages...)
if !msgSet.Has(msg) {
context.Rule.TriggeredMessages = append(context.Rule.TriggeredMessages, msg)
}
}
context.Rule.TriggeredMessages = append(context.Rule.TriggeredMessages, msg)
evalMatch.AlertDetails = jsonutils.Marshal(alertDetails)
return evalMatch, nil
}
pkg/monitor/alerting/notifiers/onecloud.go
+1 -1
View File
@@ -509,7 +509,7 @@ func (s *sendRobotImpl) execNotifyFunc() error {
func SendNotifyInfo(base *sendnotifyBase, imp Isendnotify) error {
tmpMatches := base.config.Matches
batch := 10
batch := 100
for i := 0; i < len(tmpMatches); i += batch {
split := i + batch
if split > len(tmpMatches) {