opensource/cloudpods
3
0
Fork 0
mirror of https://github.com/yunionio/cloudpods.git synced 2026-09-24 16:03:43 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #14877 from ioito/hotfix/qx-azure-win-metric

Browse Source 
fix(cloudmon): azure windows metric
This commit is contained in:
Zexi Li
2022-08-30 14:24:07 +08:00
committed by GitHub
parent 6c9326ad96 e3ccad74c2
commit 47ff4eb2b7
1 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/multicloud/azure/monitor.go
+12 -6
View File
@@ -24,6 +24,7 @@ import (
"yunion.io/x/log"
"yunion.io/x/pkg/errors"
"yunion.io/x/pkg/utils"
api "yunion.io/x/onecloud/pkg/apis/compute"
"yunion.io/x/onecloud/pkg/cloudprovider"
@@ -174,12 +175,16 @@ func (self *SAzureClient) GetEcsMetrics(opts *cloudprovider.MetricListOptions) (
return nil, err
}
for metricType, name := range map[cloudprovider.TMetricType]string{
cloudprovider.VM_METRIC_TYPE_MEM_USAGE: "/builtin/memory/percentusedmemory",
cloudprovider.VM_METRIC_TYPE_DISK_USAGE: "/builtin/filesystem/percentusedspace",
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"},
} {
filter := fmt.Sprintf("name.value eq '%s'", name)
metricDefinitions, err := self.getMetricDefinitions(opts.ResourceId, filter)
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
@@ -206,7 +211,8 @@ func (self *SAzureClient) GetEcsMetrics(opts *cloudprovider.MetricListOptions) (
values := &AzureTableMetricData{}
resp.Unmarshal(values)
for _, v := range values.Value {
if v.CounterName != name {
name := strings.ReplaceAll(v.CounterName, `\\`, `\`)
if !utils.IsInStringArray(name, names) {
continue
}
if v.Timestamp.After(opts.StartTime) && v.Timestamp.Before(opts.EndTime) {