From 4f7ad853dfea460b10236d0aaa7c78963224a32b Mon Sep 17 00:00:00 2001
From: zhaoxiangchun <1422928955@qq.com>
Date: Fri, 7 May 2021 09:39:21 +0800
Subject: [PATCH] fix(monitor): monitor query : cloudaccount no data fix
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

1.修复云账号余额监控查询无数据返回
---
 pkg/monitor/alerting/conditions/query.go | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pkg/monitor/alerting/conditions/query.go b/pkg/monitor/alerting/conditions/query.go
index 7fd27cf828..6699dba36b 100644
--- a/pkg/monitor/alerting/conditions/query.go
+++ b/pkg/monitor/alerting/conditions/query.go
@@ -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: