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 #10984 from zhaoxiangchun/automated-cherry-pick-of-#10983-upstream-release-3.7

Browse Source 
Automated cherry pick of #10983: fix(monitor): monitor query : cloudaccount no data fix
This commit is contained in:
Zexi Li
2021-05-08 10:37:33 +08:00
committed by GitHub
parent abb7197039 4f7ad853df
commit 9edb75cb55
1 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/monitor/alerting/conditions/query.go
+5
View File
@@ -555,6 +555,9 @@ func (c *QueryCondition) getOnecloudResources() ([]jsonutils.JSONObject, error)
allResources, err = ListAllResources(&mc_mds.ElasticCache, query)
case monitor.METRIC_RES_TYPE_OSS:
allResources, err = ListAllResources(&mc_mds.Buckets, query)
case monitor.METRIC_RES_TYPE_CLOUDACCOUNT:
query.Remove("status")
allResources, err = ListAllResources(&mc_mds.Cloudaccounts, query)
case monitor.METRIC_RES_TYPE_TENANT:
allResources, err = ListAllResources(&mc_mds.Projects, query)
case monitor.METRIC_RES_TYPE_DOMAIN:
@@ -721,6 +724,8 @@ func (c *QueryCondition) getTagKeyRelationMap() map[string]string {
relationMap = monitor.RedisTags
case monitor.METRIC_RES_TYPE_OSS:
relationMap = monitor.OssTags
case monitor.METRIC_RES_TYPE_CLOUDACCOUNT:
relationMap = monitor.CloudAccountTags
case monitor.METRIC_RES_TYPE_TENANT:
relationMap = monitor.TenantTags
case monitor.METRIC_RES_TYPE_DOMAIN: