fix(cloudmon): support skip pull azure memory and disk usage metric

2026-09-20 08:03:53 +08:00 · 2023-04-18 13:38:35 +08:00
parent 8ba55749b9
commit f7b7869b5d
4 changed files with 96 additions and 88 deletions
--- a/pkg/cloudmon/options/options.go
+++ b/pkg/cloudmon/options/options.go
@@ -39,7 +39,8 @@ type CloudMonOptions struct {
 	DisableServiceMetric               bool  `help:"disable service metric collect"`
 	CollectServiceMetricIntervalMinute int64 `help:"Collect Service metirc Interval unit:minute" default:"5"`

-	HistoryMetricPullDays int `help:"pull history metrics" default:"-1"`
+	HistoryMetricPullDays          int  `help:"pull history metrics" default:"-1"`
+	SupportAzureTableStorageMetric bool `help:"support collect azure memory and disk usage metric, there may be additional charges" default:"false"`

 	CloudAccountCollectMetricsBatchCount  int `help:"Cloud Account Collect Metrics Batch Count" default:"10"`
 	CloudResourceCollectMetricsBatchCount int `help:"Cloud Resource Collect Metrics BatchC ount" default:"40"`
--- a/pkg/cloudmon/providerdriver/base.go
+++ b/pkg/cloudmon/providerdriver/base.go
@@ -206,6 +206,8 @@ func (self *SCollectByResourceIdDriver) CollectServerMetrics(ctx context.Context
 				StartTime:    start,
 				EndTime:      end,
 				OsType:       vm.OsType,
+
+				IsSupportAzureTableStorageMetric: options.Options.SupportAzureTableStorageMetric,
 			}
 			opts.ResourceId = vm.ExternalId

--- a/pkg/cloudprovider/metrics.go
+++ b/pkg/cloudprovider/metrics.go
@@ -368,6 +368,9 @@ type MetricListOptions struct {
 	Interval int
 	// rds
 	Engine string
+
+	// azure 内存,磁盘使用率监控需要查询table storage,会产生额外的存储费用，默认关闭
+	IsSupportAzureTableStorageMetric bool
 }

 type MetricValue struct {
--- a/pkg/multicloud/azure/monitor.go
+++ b/pkg/multicloud/azure/monitor.go
@@ -177,104 +177,106 @@ func (self *SAzureClient) GetEcsMetrics(opts *cloudprovider.MetricListOptions) (
 		return nil, err
 	}

-	for metricType, names := range map[cloudprovider.TMetricType][]string{
-		cloudprovider.VM_METRIC_TYPE_MEM_USAGE:  {"/builtin/memory/percentusedmemory", "\\Memory\\% Committed Bytes In Use"},
-		cloudprovider.VM_METRIC_TYPE_DISK_USAGE: {"/builtin/filesystem/percentusedspace", "\\LogicalDisk(_Total)\\% Free Space"},
-	} {
-		filters := []string{}
-		for _, name := range names {
-			filter := fmt.Sprintf("name.value eq '%s'", name)
-			filters = append(filters, filter)
-		}
-		metricDefinitions, err := self.getMetricDefinitions(opts.ResourceId, strings.Join(filters, " or "))
-		if err != nil {
-			log.Errorf("getMetricDefinitions error: %v", err)
-			continue
-		}
-		metric := cloudprovider.MetricValues{}
-		metric.MetricType = metricType
-		header := http.Header{}
-		header.Set("accept", "application/json;odata=minimalmetadata")
-		for _, definition := range metricDefinitions.Value {
-			for _, tables := range definition.MetricAvailabilities {
-				if tables.TimeGrain != "PT1M" {
-					continue
-				}
-				for _, table := range tables.Location.TableInfo {
-					if table.EndTime.Before(opts.EndTime) {
+	if opts.IsSupportAzureTableStorageMetric {
+		for metricType, names := range map[cloudprovider.TMetricType][]string{
+			cloudprovider.VM_METRIC_TYPE_MEM_USAGE:  {"/builtin/memory/percentusedmemory", "\\Memory\\% Committed Bytes In Use"},
+			cloudprovider.VM_METRIC_TYPE_DISK_USAGE: {"/builtin/filesystem/percentusedspace", "\\LogicalDisk(_Total)\\% Free Space"},
+		} {
+			filters := []string{}
+			for _, name := range names {
+				filter := fmt.Sprintf("name.value eq '%s'", name)
+				filters = append(filters, filter)
+			}
+			metricDefinitions, err := self.getMetricDefinitions(opts.ResourceId, strings.Join(filters, " or "))
+			if err != nil {
+				log.Errorf("getMetricDefinitions error: %v", err)
+				continue
+			}
+			metric := cloudprovider.MetricValues{}
+			metric.MetricType = metricType
+			header := http.Header{}
+			header.Set("accept", "application/json;odata=minimalmetadata")
+			for _, definition := range metricDefinitions.Value {
+				for _, tables := range definition.MetricAvailabilities {
+					if tables.TimeGrain != "PT1M" {
 						continue
 					}
-					url := fmt.Sprintf("%s%s%s", tables.Location.TableEndpoint, table.TableName, table.SasToken)
-					_, resp, err := httputils.JSONRequest(httputils.GetDefaultClient(), context.Background(), httputils.GET, url, header, nil, self.debug)
-					if err != nil {
-						log.Errorf("request %s error: %v", url, err)
-						continue
-					}
-					values := &AzureTableMetricData{}
-					resp.Unmarshal(values)
-					for _, v := range values.Value {
-						name := strings.ReplaceAll(v.CounterName, `\\`, `\`)
-						if !utils.IsInStringArray(name, names) {
+					for _, table := range tables.Location.TableInfo {
+						if table.EndTime.Before(opts.EndTime) {
 							continue
 						}
-						if v.Timestamp.After(opts.StartTime) && v.Timestamp.Before(opts.EndTime) {
-							value := v.GetValue()
-							if metricType == cloudprovider.VM_METRIC_TYPE_DISK_USAGE && strings.Contains(strings.ToLower(name), "free") {
-								value = 100 - value
+						url := fmt.Sprintf("%s%s%s", tables.Location.TableEndpoint, table.TableName, table.SasToken)
+						_, resp, err := httputils.JSONRequest(httputils.GetDefaultClient(), context.Background(), httputils.GET, url, header, nil, self.debug)
+						if err != nil {
+							log.Errorf("request %s error: %v", url, err)
+							continue
+						}
+						values := &AzureTableMetricData{}
+						resp.Unmarshal(values)
+						for _, v := range values.Value {
+							name := strings.ReplaceAll(v.CounterName, `\\`, `\`)
+							if !utils.IsInStringArray(name, names) {
+								continue
 							}
-							metric.Values = append(metric.Values, cloudprovider.MetricValue{
-								Timestamp: v.Timestamp,
-								Value:     value,
+							if v.Timestamp.After(opts.StartTime) && v.Timestamp.Before(opts.EndTime) {
+								value := v.GetValue()
+								if metricType == cloudprovider.VM_METRIC_TYPE_DISK_USAGE && strings.Contains(strings.ToLower(name), "free") {
+									value = 100 - value
+								}
+								metric.Values = append(metric.Values, cloudprovider.MetricValue{
+									Timestamp: v.Timestamp,
+									Value:     value,
+								})
+							}
+						}
+					}
+				}
+			}
+			if len(metric.Values) > 0 {
+				ret = append(ret, metric)
+			}
+		}
+
+		if len(opts.OsType) == 0 || strings.Contains(strings.ToLower(opts.OsType), "win") {
+			workspaces, err := self.GetLoganalyticsWorkspaces()
+			if err != nil {
+				return ret, nil
+			}
+			winmetric := cloudprovider.MetricValues{}
+			winmetric.MetricType = cloudprovider.VM_METRIC_TYPE_DISK_USAGE
+			winmetric.Values = []cloudprovider.MetricValue{}
+			for i := range workspaces {
+				data, err := self.GetInstanceDiskUsage(workspaces[i].SLoganalyticsWorkspaceProperties.CustomerId, opts.ResourceId, opts.StartTime, opts.EndTime)
+				if err != nil {
+					continue
+				}
+				for i := range data {
+					for j := range data[i].Rows {
+						if len(data[i].Rows[j]) == 5 {
+							date, device, free := data[i].Rows[j][0], data[i].Rows[j][1], data[i].Rows[j][2]
+							dataTime, err := timeutils.ParseTimeStr(date)
+							if err != nil {
+								continue
+							}
+							if dataTime.Second() > 15 {
+								continue
+							}
+							freeSize, err := strconv.ParseFloat(free, 64)
+							if err != nil {
+								continue
+							}
+							winmetric.Values = append(winmetric.Values, cloudprovider.MetricValue{
+								Timestamp: dataTime,
+								Value:     100 - freeSize,
+								Tags:      map[string]string{cloudprovider.METRIC_TAG_DEVICE: device},
 							})
 						}
 					}
 				}
 			}
-		}
-		if len(metric.Values) > 0 {
-			ret = append(ret, metric)
-		}
-	}
-
-	if len(opts.OsType) == 0 || strings.Contains(strings.ToLower(opts.OsType), "win") {
-		workspaces, err := self.GetLoganalyticsWorkspaces()
-		if err != nil {
-			return ret, nil
-		}
-		winmetric := cloudprovider.MetricValues{}
-		winmetric.MetricType = cloudprovider.VM_METRIC_TYPE_DISK_USAGE
-		winmetric.Values = []cloudprovider.MetricValue{}
-		for i := range workspaces {
-			data, err := self.GetInstanceDiskUsage(workspaces[i].SLoganalyticsWorkspaceProperties.CustomerId, opts.ResourceId, opts.StartTime, opts.EndTime)
-			if err != nil {
-				continue
+			if len(winmetric.Values) > 0 {
+				ret = append(ret, winmetric)
 			}
-			for i := range data {
-				for j := range data[i].Rows {
-					if len(data[i].Rows[j]) == 5 {
-						date, device, free := data[i].Rows[j][0], data[i].Rows[j][1], data[i].Rows[j][2]
-						dataTime, err := timeutils.ParseTimeStr(date)
-						if err != nil {
-							continue
-						}
-						if dataTime.Second() > 15 {
-							continue
-						}
-						freeSize, err := strconv.ParseFloat(free, 64)
-						if err != nil {
-							continue
-						}
-						winmetric.Values = append(winmetric.Values, cloudprovider.MetricValue{
-							Timestamp: dataTime,
-							Value:     100 - freeSize,
-							Tags:      map[string]string{cloudprovider.METRIC_TAG_DEVICE: device},
-						})
-					}
-				}
-			}
-		}
-		if len(winmetric.Values) > 0 {
-			ret = append(ret, winmetric)
 		}
 	}