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

fix(monitor): multiple monitor resource alert (#20365)

Browse Source
This commit is contained in:
Zexi Li
2024-05-27 15:44:32 +08:00
committed by GitHub
parent c900efe3c3
commit 6294744a43
2 changed files with 37 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/monitor/models/commonalert.go
+1 -1
View File
@@ -1449,7 +1449,7 @@ jointLoop:
errs := make([]error, 0)
for _, monRes := range monitorResources {
resDesc := fmt.Sprintf("%s/%s/%s", monRes.ResType, monRes.GetName(), monRes.ResId)
if err := monRes.AttachAlert(ctx, userCred, alert.GetId()); err != nil {
if _, err := monRes.AttachAlert(ctx, userCred, alert.GetId()); err != nil {
errs = append(errs, errors.Wrapf(err, "AttachAlert %s to %s", alert.GetName(), resDesc))
}
if err := monRes.UpdateAlertState(); err != nil {
pkg/monitor/models/monitor_resource.go
+36 -14
View File
@@ -262,7 +262,7 @@ func (man *SMonitorResourceManager) FetchCustomizeColumns(
return rows
}
func (self *SMonitorResource) AttachAlert(ctx context.Context, userCred mcclient.TokenCredential, alertId string) error {
func (self *SMonitorResource) AttachAlert(ctx context.Context, userCred mcclient.TokenCredential, alertId string) (*SMonitorResourceAlert, error) {
iModel, _ := db.NewModelObject(MonitorResourceAlertManager)
input := monitor.MonitorResourceJointCreateInput{
MonitorResourceId: self.ResId,
@@ -272,12 +272,12 @@ func (self *SMonitorResource) AttachAlert(ctx context.Context, userCred mcclient
data := input.JSON(&input)
err := data.Unmarshal(iModel)
if err != nil {
return errors.Wrap(err, "MonitorResourceJointCreateInput unmarshal to joint err")
return nil, errors.Wrap(err, "MonitorResourceJointCreateInput unmarshal to joint err")
}
if err := MonitorResourceAlertManager.TableSpec().Insert(ctx, iModel); err != nil {
return errors.Wrap(err, "insert MonitorResourceJoint model err")
return nil, errors.Wrap(err, "insert MonitorResourceJoint model err")
}
return nil
return iModel.(*SMonitorResourceAlert), nil
}
func (self *SMonitorResource) UpdateAlertState() error {
@@ -437,22 +437,44 @@ func (self *SMonitorResource) UpdateAttachJoint(alertRecord *SAlertRecord, match
return errors.Wrapf(err, "SMonitorResource:%s UpdateAttachJoint err", self.Name)
}
errs := make([]error, 0)
// 报警时发现没有进行关联，增加attach
if len(joints) == 0 {
self.AttachAlert(context.Background(), nil, alertRecord.AlertId)
joints, _ = MonitorResourceAlertManager.GetJoinsByListInput(monitor.
MonitorResourceJointListInput{MonitorResourceId: self.
ResId, AlertId: alertRecord.AlertId})
}
updateJoints := make([]SMonitorResourceAlert, 0)
for _, joint := range joints {
err := joint.UpdateAlertRecordData(alertRecord, &match)
jointMatch := new(monitor.EvalMatch)
if joint.Data != nil {
if err := joint.Data.Unmarshal(jointMatch); err != nil {
return errors.Wrapf(err, "unmarshal joint %s to monitor.EvalMatch", jsonutils.Marshal(joint))
}
if jointMatch.Metric == match.Metric {
tmpJoint := joint
updateJoints = append(updateJoints, tmpJoint)
}
}
}
// 报警时发现没有进行关联，增加attach
if len(updateJoints) == 0 {
newJoint, err := self.AttachAlert(context.Background(), nil, alertRecord.AlertId)
if err != nil {
errs = append(errs, errors.Wrapf(err, "joint %s:%s %s:%s UpdateAlertRecordData err",
log.Errorf("attach alert error: %s", err)
}
log.Infof("Attach Alert joint: %#v, match: %s", newJoint, jsonutils.Marshal(match))
if err := newJoint.UpdateAlertRecordData(alertRecord, &match); err != nil {
errs = append(errs, errors.Wrapf(err, "new joint %s:%s %s:%s UpdateAlertRecordData err",
MonitorResourceAlertManager.GetMasterFieldName(), self.ResId,
MonitorResourceAlertManager.GetSlaveFieldName(), alertRecord.AlertId))
}
} else {
for _, joint := range updateJoints {
err := joint.UpdateAlertRecordData(alertRecord, &match)
if err != nil {
errs = append(errs, errors.Wrapf(err, "joint %s:%s %s:%s UpdateAlertRecordData err",
MonitorResourceAlertManager.GetMasterFieldName(), self.ResId,
MonitorResourceAlertManager.GetSlaveFieldName(), alertRecord.AlertId))
}
}
}
if err := self.UpdateAlertState(); err != nil {
errs = append(errs, errors.Wrapf(err, "UpdateAlertState"))
}
self.UpdateAlertState()
return errors.NewAggregate(errs)
}