opensource/cloudpods
3
0
Fork 0
mirror of https://github.com/yunionio/cloudpods.git synced 2026-09-01 15:07:17 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #12026 from zhaoxiangchun/automated-cherry-pick-of-#12024-upstream-release-3.7

Browse Source 
Automated cherry pick of #12024: feat(cloudmon): support HuaweiCloudStack rds metric
This commit is contained in:
Zexi Li
2021-08-26 12:34:49 +08:00
committed by GitHub
parent 1f56517f4d b96c560915
commit 28561dbea1
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/cloudmon/collectors/huaweimon/hwservice.go
+3 -3
View File
@@ -120,7 +120,6 @@ func (self *SHwCloudReport) collectRegionMetricOfRds(region cloudprovider.ICloud
servers []jsonutils.JSONObject) error {
dataList := make([]influxdb.SMetricData, 0)
hwReg := region.(*huawei.SRegion)
since, until, err := common.TimeRangeFromArgs(self.Args)
if err != nil {
return err
@@ -159,9 +158,10 @@ func (self *SHwCloudReport) collectRegionMetricOfRds(region cloudprovider.ICloud
if tmp > len(metas) {
tmp = len(metas)
}
metricDatas, err := hwReg.GetMetricsData(metas[index:tmp], since, until)
metricDatas, err := self.GetMetricData(region, metas[index:tmp], since, until)
if err != nil {
return err
log.Errorln(err)
continue
}
if len(metricDatas) > 0 {
for _, metricData := range metricDatas {