From b96c560915816a68e5c74e81c351ff2ed8d6cebf Mon Sep 17 00:00:00 2001 From: zhaoxiangchun <1422928955@qq.com> Date: Thu, 26 Aug 2021 11:19:00 +0800 Subject: [PATCH] feat(cloudmon): support HuaweiCloudStack rds metric --- pkg/cloudmon/collectors/huaweimon/hwservice.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkg/cloudmon/collectors/huaweimon/hwservice.go b/pkg/cloudmon/collectors/huaweimon/hwservice.go index 3e657898bd..ee9fea85ee 100644 --- a/pkg/cloudmon/collectors/huaweimon/hwservice.go +++ b/pkg/cloudmon/collectors/huaweimon/hwservice.go @@ -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 {