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(moniotr): filter dirty resource alerts (#21217)

Browse Source
This commit is contained in:
Zexi Li
2024-09-12 10:05:23 +08:00
committed by GitHub
parent e4fd6508c2
commit 6c14dbadb7
1 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/monitor/models/monitor_resource_alert.go
+8 -2
View File
@@ -179,6 +179,8 @@ func (m *SMonitorResourceAlertManager) ListItemFilter(ctx context.Context, q *sq
if err != nil {
return q, errors.Wrap(err, "SJointResourceBaseManager ListItemFilter err")
}
alertSq := AlertManager.Query("id").SubQuery()
q = q.In("alert_id", alertSq)
if len(input.AlertState) > 0 {
q = q.Equals("alert_state", input.AlertState)
}
@@ -244,6 +246,8 @@ func (man *SMonitorResourceAlertManager) FetchCustomizeColumns(
}
func (obj *SMonitorResourceAlert) getMoreDetails(detail monitor.MonitorResourceJointDetails) monitor.MonitorResourceJointDetails {
detail.ResType = obj.ResType
detail.ResId = obj.MonitorResourceId
resources, err := MonitorResourceManager.GetMonitorResources(monitor.MonitorResourceListInput{ResId: []string{obj.
MonitorResourceId}})
if err != nil {
@@ -253,9 +257,11 @@ func (obj *SMonitorResourceAlert) getMoreDetails(detail monitor.MonitorResourceJ
if len(resources) == 0 {
return detail
}
detail.ResType = resources[0].ResType
if detail.ResType == "" {
detail.ResType = resources[0].ResType
}
detail.ResName = resources[0].Name
detail.ResId = resources[0].ResId
//detail.ResId = resources[0].ResId
if len(obj.AlertRecordId) != 0 {
record, err := AlertRecordManager.GetAlertRecord(obj.AlertRecordId)