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 #16183 from gouqi11/fixHCSORdsMonitor

Browse Source 
fix(cloudmon): hcso monitor make mod
This commit is contained in:
Zexi Li
2023-03-09 14:54:34 +08:00
committed by GitHub
parent cd42b2b346 a726d459bd
commit cab7732030
4 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
go.mod
+1 -1
View File
@@ -83,7 +83,7 @@ require (
k8s.io/client-go v0.19.3
k8s.io/cluster-bootstrap v0.19.3
moul.io/http2curl/v2 v2.3.0
yunion.io/x/cloudmux v0.3.10-0-alpha.1.0.20230307064251-071c538f01cc
yunion.io/x/cloudmux v0.3.10-0-alpha.1.0.20230309064841-9f842006b21d
yunion.io/x/executor v0.0.0-20211018100936-39a2cd966656
yunion.io/x/jsonutils v1.0.1-0.20220819091305-3bab322ab4fd
yunion.io/x/log v1.0.0
go.sum
+2 -2
View File
@@ -1164,8 +1164,8 @@ sigs.k8s.io/structured-merge-diff/v4 v4.0.1/go.mod h1:bJZC9H9iH24zzfZ/41RGcq60oK
sigs.k8s.io/yaml v1.1.0/go.mod h1:UJmg0vDUVViEyp3mgSv9WPwZCDxu4rQW1olrI1uml+o=
sigs.k8s.io/yaml v1.2.0 h1:kr/MCeFWJWTwyaHoR9c8EjH9OumOmoF9YGiZd7lFm/Q=
sigs.k8s.io/yaml v1.2.0/go.mod h1:yfXDCHCao9+ENCvLSE62v9VSji2MKu5jeNfTrofGhJc=
yunion.io/x/cloudmux v0.3.10-0-alpha.1.0.20230307064251-071c538f01cc h1:tgrZmTo6RNjl8L68WIP8azQrKzkbv6mcAA3xWrpYt+o=
yunion.io/x/cloudmux v0.3.10-0-alpha.1.0.20230307064251-071c538f01cc/go.mod h1:sWqblYRhQCO63xeKdxdAT3wczCCY8Mc+TDa3WD/a5Kg=
yunion.io/x/cloudmux v0.3.10-0-alpha.1.0.20230309064841-9f842006b21d h1:EBYggOjBPBxVyMLeXqMyoF7/YCwXDDsz7zVsDXBR+EU=
yunion.io/x/cloudmux v0.3.10-0-alpha.1.0.20230309064841-9f842006b21d/go.mod h1:sWqblYRhQCO63xeKdxdAT3wczCCY8Mc+TDa3WD/a5Kg=
yunion.io/x/executor v0.0.0-20211018100936-39a2cd966656 h1:0zlZD5uhZoIHgLVAWCz2aHaYk2ZrNsACCYD7R6EIBII=
yunion.io/x/executor v0.0.0-20211018100936-39a2cd966656/go.mod h1:Uxuou9WQIeJXNpy7t2fPLL0BYLvLiMvGQwY7Qc6aSws=
yunion.io/x/jsonutils v0.0.0-20190625054549-a964e1e8a051/go.mod h1:4N0/RVzsYL3kH3WE/H1BjUQdFiWu50JGCFQuuy+Z634=
vendor/modules.txt
Vendored
+1 -1
View File
@@ -1442,7 +1442,7 @@ sigs.k8s.io/structured-merge-diff/v4/value
# sigs.k8s.io/yaml v1.2.0
## explicit; go 1.12
sigs.k8s.io/yaml
# yunion.io/x/cloudmux v0.3.10-0-alpha.1.0.20230307064251-071c538f01cc
# yunion.io/x/cloudmux v0.3.10-0-alpha.1.0.20230309064841-9f842006b21d
## explicit; go 1.18
yunion.io/x/cloudmux/pkg/apis
yunion.io/x/cloudmux/pkg/apis/billing
vendor/yunion.io/x/cloudmux/pkg/multicloud/hcso/monitor.go
Generated Vendored
+8 -2
View File
@@ -119,6 +119,8 @@ func (self *SHuaweiClient) getServerMetrics(opts *cloudprovider.MetricListOption
result := []cloudprovider.MetricValues{}
namespace, dimesionName, metricNames := "SYS.ECS", "instance_id", []string{
"cpu_util",
"mem_util",
"disk_util_inband",
"network_incoming_bytes_aggregate_rate",
"network_outgoing_bytes_aggregate_rate",
"disk_read_bytes_rate",
@@ -154,6 +156,10 @@ func (self *SHuaweiClient) getServerMetrics(opts *cloudprovider.MetricListOption
switch metricData.MetricName {
case "cpu_util":
ret.MetricType = cloudprovider.VM_METRIC_TYPE_CPU_USAGE
case "mem_util":
ret.MetricType = cloudprovider.VM_METRIC_TYPE_MEM_USAGE
case "disk_util_inband":
ret.MetricType = cloudprovider.VM_METRIC_TYPE_DISK_USAGE
case "network_incoming_bytes_aggregate_rate":
ret.MetricType = cloudprovider.VM_METRIC_TYPE_NET_BPS_RX
tags = map[string]string{"net_type": "internet"}
@@ -224,7 +230,7 @@ func (self *SHuaweiClient) getRdsMetrics(opts *cloudprovider.MetricListOptions)
continue
}
metricData := MetricData{}
err = resp.Unmarshal(&metricData, "metrics")
err = resp.Unmarshal(&metricData)
if err != nil {
return nil, errors.Wrapf(err, "resp.Unmarshal")
}
@@ -302,7 +308,7 @@ func (self *SHuaweiClient) getBucketMetrics(opts *cloudprovider.MetricListOption
continue
}
metricData := MetricData{}
err = resp.Unmarshal(&metricData, "metrics")
err = resp.Unmarshal(&metricData)
if err != nil {
return nil, errors.Wrapf(err, "resp.Unmarshal")
}