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): alert shield is not working (#23861)

Browse Source
This commit is contained in:
Zexi Li
2025-11-27 19:18:37 +08:00
committed by GitHub
parent 0ec78aaa8a
commit 79166f9aaa
3 changed files with 19 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/monitor/alerting/eval_context.go
+10 -20
View File
@@ -214,13 +214,12 @@ func (c *EvalContext) GetNotificationTemplateConfig(matches []*monitor.EvalMatch
Matches: matches,
MatchTags: make([]map[string]string, len(matches)),
MatchTagsStr: make([]string, len(matches)),
//Matches: c.GetEvalMatches(),
StartTime: c.StartTime.In(tz).Format("2006-01-02 15:04:05"),
EndTime: c.EndTime.In(tz).Format("2006-01-02 15:04:05"),
Description: desc,
Level: c.Rule.Level,
NoDataFound: c.NoDataFound,
WebUrl: c.GetCallbackURLPrefix(),
StartTime: c.StartTime.In(tz).Format("2006-01-02 15:04:05"),
EndTime: c.EndTime.In(tz).Format("2006-01-02 15:04:05"),
Description: desc,
Level: c.Rule.Level,
NoDataFound: c.NoDataFound,
WebUrl: c.GetCallbackURLPrefix(),
}
// calculate match tags
diffKeySets := make(map[string]sets.String)
@@ -249,23 +248,14 @@ func (c *EvalContext) GetNotificationTemplateConfig(matches []*monitor.EvalMatch
return cfg
}
func (c *EvalContext) GetEvalMatches() []monitor.EvalMatch {
ret := make([]monitor.EvalMatch, 0)
func (c *EvalContext) GetEvalMatches() []*monitor.EvalMatch {
ret := make([]*monitor.EvalMatch, 0)
matches := c.EvalMatches
if !c.Firing {
matches = c.AlertOkEvalMatches
}
for _, c := range matches {
for i, c := range matches {
if _, ok := c.Tags[monitor.ALERT_RESOURCE_RECORD_SHIELD_KEY]; ok {
continue
}
ret = append(ret, monitor.EvalMatch{
Condition: c.Condition,
Value: c.Value,
ValueStr: c.ValueStr,
Metric: c.Metric,
Tags: c.Tags,
})
ret = append(ret, matches[i])
}
return ret
}
pkg/monitor/alerting/notifier.go
+7 -9
View File
@@ -149,6 +149,8 @@ func (n *notificationService) getNeededNotifiers(nIds []string, evalCtx *EvalCon
}
func (n *notificationService) syncResources(evalCtx *EvalContext, shouldNotify bool) {
n.processNeedShieldEvalMatches(evalCtx, evalCtx.EvalMatches)
n.processNeedShieldEvalMatches(evalCtx, evalCtx.AlertOkEvalMatches)
if shouldNotify || evalCtx.Rule.State == monitor.AlertStateAlerting {
go func() {
if err := n.createAlertRecordWhenNotify(evalCtx, shouldNotify); err != nil {
@@ -178,7 +180,6 @@ func (n *notificationService) createAlertRecordWhenNotify(evalCtx *EvalContext,
} else {
matches = evalCtx.AlertOkEvalMatches
}
n.dealNeedShieldEvalMatches(evalCtx, matches)
recordCreateInput := monitor.AlertRecordCreateInput{
StandaloneResourceCreateInput: apis.StandaloneResourceCreateInput{
GenerateName: evalCtx.Rule.Name,
@@ -217,35 +218,32 @@ func (n *notificationService) createAlertRecordWhenNotify(evalCtx *EvalContext,
return nil
}
func (n *notificationService) dealNeedShieldEvalMatches(evalCtx *EvalContext, match []*monitor.EvalMatch) {
func (n *notificationService) processNeedShieldEvalMatches(evalCtx *EvalContext, match []*monitor.EvalMatch) {
input := monitor.AlertRecordShieldListInput{
ResType: evalCtx.Rule.RuleDescription[0].ResType,
AlertId: evalCtx.Rule.Id,
}
filterMatch:
for i := range match {
input.ResId = monitor.GetMeasurementResourceId(match[i].Tags, input.ResType)
alertRecordShields, err := models.AlertRecordShieldManager.GetRecordShields(input)
if err != nil {
log.Errorf("GetRecordShields byAlertId:%s,err:%v", input.AlertId, err)
return
log.Errorf("GetRecordShields by input: %s, err: %v", jsonutils.Marshal(input), err)
continue
}
if len(alertRecordShields) != 0 {
for _, shield := range alertRecordShields {
if shield.EndTime.After(time.Now().UTC()) && shield.StartTime.Before(time.Now().UTC()) {
match[i].Tags[monitor.ALERT_RESOURCE_RECORD_SHIELD_KEY] = monitor.ALERT_RESOURCE_RECORD_SHIELD_VALUE
continue filterMatch
break
}
}
}
}
}
func (n *notificationService) detachAlertResourceWhenNodata(evalCtx *EvalContext) {
errs := models.CommonAlertManager.DetachAlertResourceByAlertId(evalCtx.Ctx, evalCtx.UserCred, evalCtx.Rule.Id)
if len(errs) != 0 {
log.Errorf("detachAlertResourceWhenNodata err:%#v", errors.NewAggregate(errs))
log.Errorf("detachAlertResourceWhenNodata err: %v", errors.NewAggregate(errs).Error())
}
}
pkg/monitor/alerting/notifiers/onecloud.go
+2 -2
View File
@@ -320,8 +320,8 @@ func (oc *OneCloudNotifier) notifyByContextLang(ctx context.Context, evalCtx *al
log.Warningf("skip notify rule because state is pending: %s", jsonutils.Marshal(evalCtx.Rule))
return nil
}
if len(evalCtx.EvalMatches) > 0 {
if err := oc.notifyMatchesByContextLang(ctx, evalCtx, evalCtx.EvalMatches, uids, false); err != nil {
if len(evalCtx.GetEvalMatches()) > 0 {
if err := oc.notifyMatchesByContextLang(ctx, evalCtx, evalCtx.GetEvalMatches(), uids, false); err != nil {
errs = append(errs, errors.Wrapf(err, "notify alerting matches"))
}
}