From 48436a7d3c65102a73afeb709d51c1f10b9b86bc Mon Sep 17 00:00:00 2001
From: ioito <qu_xuan@icloud.com>
Date: Wed, 28 Sep 2022 18:14:07 +0800
Subject: [PATCH] fix(cloudmon): remove cloudmon metadata tag

---
 pkg/apis/compute/bucket.go       | 6 ------
 pkg/apis/compute/cloudaccount.go | 6 ------
 pkg/apis/compute/dbinstance.go   | 5 -----
 pkg/apis/compute/elasticcache.go | 6 ------
 pkg/apis/compute/guests.go       | 6 ------
 pkg/apis/compute/host.go         | 7 -------
 pkg/apis/compute/storage.go      | 6 ------
 7 files changed, 42 deletions(-)

diff --git a/pkg/apis/compute/bucket.go b/pkg/apis/compute/bucket.go
index a927a4bd9a..6bc31bfb40 100644
--- a/pkg/apis/compute/bucket.go
+++ b/pkg/apis/compute/bucket.go
@@ -16,7 +16,6 @@ package compute
 
 import (
 	"net/http"
-	"strings"
 
 	"yunion.io/x/pkg/errors"
 	"yunion.io/x/pkg/util/regutils"
@@ -79,11 +78,6 @@ func (self BucketDetails) GetMetricTags() map[string]string {
 		"tenant":         self.Project,
 		"tenant_id":      self.ProjectId,
 	}
-	for k, v := range self.Metadata {
-		if strings.HasPrefix(k, apis.USER_TAG_PREFIX) {
-			ret[k] = v
-		}
-	}
 	return ret
 }
 
diff --git a/pkg/apis/compute/cloudaccount.go b/pkg/apis/compute/cloudaccount.go
index a1fb5e72ca..b7c54c8ff0 100644
--- a/pkg/apis/compute/cloudaccount.go
+++ b/pkg/apis/compute/cloudaccount.go
@@ -17,7 +17,6 @@ package compute
 import (
 	"fmt"
 	"reflect"
-	"strings"
 
 	"yunion.io/x/jsonutils"
 	"yunion.io/x/pkg/gotypes"
@@ -328,11 +327,6 @@ func (self CloudaccountDetail) GetMetricTags() map[string]string {
 		"domain_id":         self.DomainId,
 		"project_domain":    self.ProjectDomain,
 	}
-	for k, v := range self.Metadata {
-		if strings.HasPrefix(k, apis.USER_TAG_PREFIX) {
-			ret[k] = v
-		}
-	}
 	return ret
 }
 
diff --git a/pkg/apis/compute/dbinstance.go b/pkg/apis/compute/dbinstance.go
index 11adaa5c80..7bd2d2032d 100644
--- a/pkg/apis/compute/dbinstance.go
+++ b/pkg/apis/compute/dbinstance.go
@@ -344,11 +344,6 @@ func (self DBInstanceDetails) GetMetricTags() map[string]string {
 	if len(self.IpAddrs) > 0 {
 		ret["rds_ip"] = strings.ReplaceAll(self.IpAddrs, ",", "|")
 	}
-	for k, v := range self.Metadata {
-		if strings.HasPrefix(k, apis.USER_TAG_PREFIX) {
-			ret[k] = v
-		}
-	}
 	return ret
 }
 
diff --git a/pkg/apis/compute/elasticcache.go b/pkg/apis/compute/elasticcache.go
index 60a6a2de05..022c13468e 100644
--- a/pkg/apis/compute/elasticcache.go
+++ b/pkg/apis/compute/elasticcache.go
@@ -15,7 +15,6 @@
 package compute
 
 import (
-	"strings"
 	"time"
 
 	"yunion.io/x/onecloud/pkg/apis"
@@ -57,11 +56,6 @@ func (self ElasticcacheDetails) GetMetricTags() map[string]string {
 		"domain_id":      self.DomainId,
 		"project_domain": self.ProjectDomain,
 	}
-	for k, v := range self.Metadata {
-		if strings.HasPrefix(k, apis.USER_TAG_PREFIX) {
-			ret[k] = v
-		}
-	}
 	return ret
 }
 
diff --git a/pkg/apis/compute/guests.go b/pkg/apis/compute/guests.go
index a07dea9f0f..80d34d401d 100644
--- a/pkg/apis/compute/guests.go
+++ b/pkg/apis/compute/guests.go
@@ -16,7 +16,6 @@ package compute
 
 import (
 	"fmt"
-	"strings"
 	"time"
 
 	"yunion.io/x/jsonutils"
@@ -288,11 +287,6 @@ func (self ServerDetails) GetMetricTags() map[string]string {
 		"account":             self.Account,
 		"account_id":          self.AccountId,
 	}
-	for k, v := range self.Metadata {
-		if strings.HasPrefix(k, apis.USER_TAG_PREFIX) {
-			ret[k] = v
-		}
-	}
 	return ret
 }
 
diff --git a/pkg/apis/compute/host.go b/pkg/apis/compute/host.go
index c1cfba5510..ae7bc4b366 100644
--- a/pkg/apis/compute/host.go
+++ b/pkg/apis/compute/host.go
@@ -15,8 +15,6 @@
 package compute
 
 import (
-	"strings"
-
 	"yunion.io/x/jsonutils"
 
 	"yunion.io/x/onecloud/pkg/apis"
@@ -250,11 +248,6 @@ func (self HostDetails) GetMetricTags() map[string]string {
 		"res_type":       "host",
 		"account_id":     self.AccountId,
 	}
-	for k, v := range self.Metadata {
-		if strings.HasPrefix(k, apis.USER_TAG_PREFIX) {
-			ret[k] = v
-		}
-	}
 	return ret
 }
 
diff --git a/pkg/apis/compute/storage.go b/pkg/apis/compute/storage.go
index afba0b98c5..58e4db23b5 100644
--- a/pkg/apis/compute/storage.go
+++ b/pkg/apis/compute/storage.go
@@ -16,7 +16,6 @@ package compute
 
 import (
 	"strconv"
-	"strings"
 
 	"yunion.io/x/jsonutils"
 
@@ -159,11 +158,6 @@ func (self StorageDetails) GetMetricTags() map[string]string {
 		"domain_id":      self.DomainId,
 		"project_domain": self.ProjectDomain,
 	}
-	for k, v := range self.Metadata {
-		if strings.HasPrefix(k, apis.USER_TAG_PREFIX) {
-			ret[k] = v
-		}
-	}
 	return ret
 }