Merge pull request #11819 from zhaoxiangchun/automated-cherry-pick-of-#11443-upstream-release-3.7

Automated cherry pick of #11443: fix(monitor): fix agent monitor query

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",

pkg/monitor/alerting/conditions/query.go

@@ -754,6 +754,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
 	}