From 40f33db2a267480c0e77ccf41b0b6d714559cac6 Mon Sep 17 00:00:00 2001 From: zhaoxiangchun <1422928955@qq.com> Date: Fri, 18 Jun 2021 18:52:34 +0800 Subject: [PATCH] fix(monitor): fix agent monitor query MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 1.修复agent监控查询图表显示id的问题 --- pkg/apis/monitor/unifiedmonitor_const.go | 1 + pkg/monitor/alerting/conditions/query.go | 2 ++ 2 files changed, 3 insertions(+) diff --git a/pkg/apis/monitor/unifiedmonitor_const.go b/pkg/apis/monitor/unifiedmonitor_const.go index 287c698348..ca86082c6b 100644 --- a/pkg/apis/monitor/unifiedmonitor_const.go +++ b/pkg/apis/monitor/unifiedmonitor_const.go @@ -20,6 +20,7 @@ var ( METRIC_RES_TYPE_OSS: "oss_name", METRIC_RES_TYPE_CLOUDACCOUNT: "cloudaccount_name", METRIC_RES_TYPE_STORAGE: "storage_name", + METRIC_RES_TYPE_AGENT: "vm_name", } MEASUREMENT_TAG_ID = map[string]string{ METRIC_RES_TYPE_HOST: "host_id", diff --git a/pkg/monitor/alerting/conditions/query.go b/pkg/monitor/alerting/conditions/query.go index ae8e7eead5..bd90e2a9e1 100644 --- a/pkg/monitor/alerting/conditions/query.go +++ b/pkg/monitor/alerting/conditions/query.go @@ -752,6 +752,8 @@ func (c *QueryCondition) getTagKeyRelationMap() map[string]string { relationMap = monitor.DomainTags case monitor.METRIC_RES_TYPE_STORAGE: relationMap = monitor.StorageTags + case monitor.METRIC_RES_TYPE_AGENT: + relationMap = monitor.ServerTags default: relationMap = monitor.HostTags }