From 63e2e1fa4e85a1e4cbd78f6fdf662684311d4df9 Mon Sep 17 00:00:00 2001 From: ioito Date: Fri, 2 Sep 2022 18:02:07 +0800 Subject: [PATCH] fix(cloudmon): server metric tag --- pkg/apis/compute/bucket.go | 4 ++-- pkg/apis/compute/elasticcache.go | 4 ++-- pkg/apis/compute/guests.go | 6 +++--- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/pkg/apis/compute/bucket.go b/pkg/apis/compute/bucket.go index cd94162297..4256db0355 100644 --- a/pkg/apis/compute/bucket.go +++ b/pkg/apis/compute/bucket.go @@ -75,8 +75,8 @@ func (self BucketDetails) GetMetricTags() map[string]string { "project_domain": self.ProjectDomain, "region_ext_id": self.RegionExtId, "status": self.Status, - "tenant": self.Tenant, - "tenant_id": self.TenantId, + "tenant": self.Project, + "tenant_id": self.ProjectId, } for k, v := range self.Metadata { if strings.HasPrefix(k, apis.USER_TAG_PREFIX) { diff --git a/pkg/apis/compute/elasticcache.go b/pkg/apis/compute/elasticcache.go index e071fa4f07..91b75a3191 100644 --- a/pkg/apis/compute/elasticcache.go +++ b/pkg/apis/compute/elasticcache.go @@ -50,8 +50,8 @@ func (self ElasticcacheDetails) GetMetricTags() map[string]string { "cloudregion": self.Cloudregion, "cloudregion_id": self.CloudregionId, "region_ext_id": self.RegionExtId, - "tenant": self.Tenant, - "tenant_id": self.TenantId, + "tenant": self.Project, + "tenant_id": self.ProjectId, "brand": self.Brand, "domain_id": self.DomainId, "project_domain": self.ProjectDomain, diff --git a/pkg/apis/compute/guests.go b/pkg/apis/compute/guests.go index 6d3b777090..55569d2fc9 100644 --- a/pkg/apis/compute/guests.go +++ b/pkg/apis/compute/guests.go @@ -263,12 +263,12 @@ func (self ServerDetails) GetMetricTags() map[string]string { "cloudregion": self.Cloudregion, "cloudregion_id": self.CloudregionId, "region_ext_id": self.RegionExtId, - "tenant": self.Tenant, - "tenant_id": self.TenantId, + "tenant": self.Project, + "tenant_id": self.ProjectId, "brand": self.Brand, "vm_scaling_group_id": self.ScalingGroupId, "domain_id": self.DomainId, - "project_domain": self.TenantId, + "project_domain": self.ProjectDomain, "account": self.Account, "account_id": self.AccountId, }