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

Merge pull request #11494 from zhaoxiangchun/feature/zxc-overview-monitor-resource

Browse Source 
fix(monitor): update monitor resourece joint scope
This commit is contained in:
Zexi Li
2021-06-28 19:40:38 +08:00
committed by GitHub
parent e6e2f21f5e f8b690602d
commit 4b9626d9e4
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/monitor/models/monitor_resource.go
+6 -3
View File
@@ -295,10 +295,13 @@ func (manager *SMonitorResourceManager) GetPropertyAlert(ctx context.Context, us
func (manager *SMonitorResourceManager) UpdateMonitorResourceAttachJoint(ctx context.Context,
userCred mcclient.TokenCredential, alertRecord *SAlertRecord) error {
if !utils.IsInStringArray(alertRecord.ResType, []string{monitor.METRIC_RES_TYPE_HOST,
monitor.METRIC_RES_TYPE_GUEST}) {
monitor.METRIC_RES_TYPE_GUEST, monitor.METRIC_RES_TYPE_AGENT}) {
return nil
}
resType := alertRecord.ResType
if resType == monitor.METRIC_RES_TYPE_AGENT {
resType = monitor.METRIC_RES_TYPE_GUEST
}
matches, _ := alertRecord.GetEvalData()
errs := make([]error, 0)
for _, matche := range matches {
@@ -306,7 +309,7 @@ func (manager *SMonitorResourceManager) UpdateMonitorResourceAttachJoint(ctx con
if len(resId) == 0 {
continue
}
monitorResources, err := manager.GetMonitorResources(monitor.MonitorResourceListInput{ResType: alertRecord.ResType, ResId: []string{resId}})
monitorResources, err := manager.GetMonitorResources(monitor.MonitorResourceListInput{ResType: resType, ResId: []string{resId}})
if err != nil {
errs = append(errs, errors.Wrapf(err, "SMonitorResourceManager GetMonitorResources by resId:%s err", resId))
continue