diff --git a/pkg/cloudmon/collectors/apsaramon/apsaraservice.go b/pkg/cloudmon/collectors/apsaramon/apsaraservice.go index 3a4623d0f7..4841699ecc 100644 --- a/pkg/cloudmon/collectors/apsaramon/apsaraservice.go +++ b/pkg/cloudmon/collectors/apsaramon/apsaraservice.go @@ -279,6 +279,7 @@ func (self *SApsaraCloudReport) collectRegionMetricOfElb(region cloudprovider.IC } } } + log.Infof("SendMetrics %s length: %d", metricName, len(dataList)) } return common.SendMetrics(self.Session, dataList, self.Args.Debug, "") } diff --git a/pkg/cloudmon/collectors/apsaramon/apsarautils.go b/pkg/cloudmon/collectors/apsaramon/apsarautils.go index 772288f7c7..950dda3a55 100644 --- a/pkg/cloudmon/collectors/apsaramon/apsarautils.go +++ b/pkg/cloudmon/collectors/apsaramon/apsarautils.go @@ -177,7 +177,9 @@ var aliOSSMetricSpecs = map[string][]string{ } var aliElbMetricSpecs = map[string][]string{ "InstanceTrafficRX": {DEFAULT_STATISTICS, UNIT_BPS, INFLUXDB_FIELD_ELB_NET_BPS_RX}, + "TrafficRXNew": {DEFAULT_STATISTICS, UNIT_BPS, INFLUXDB_FIELD_ELB_NET_BPS_RX}, "InstanceTrafficTX": {DEFAULT_STATISTICS, UNIT_BPS, INFLUXDB_FIELD_ELB_NET_BPS_TX}, + "TrafficTXNew": {DEFAULT_STATISTICS, UNIT_BPS, INFLUXDB_FIELD_ELB_NET_BPS_TX}, "InstanceStatusCode2xx": {DEFAULT_STATISTICS, UNIT_COUNT_SEC, INFLUXDB_FIELD_ELB_HRSP_COUNT_2XX}, "InstanceStatusCode3xx": {DEFAULT_STATISTICS, UNIT_COUNT_SEC, INFLUXDB_FIELD_ELB_HRSP_COUNT_3XX}, "InstanceStatusCode4xx": {DEFAULT_STATISTICS, UNIT_COUNT_SEC, INFLUXDB_FIELD_ELB_HRSP_COUNT_4XX}, diff --git a/pkg/cloudmon/collectors/common/basemon.go b/pkg/cloudmon/collectors/common/basemon.go index c2fe8ae484..3a5d7d1676 100644 --- a/pkg/cloudmon/collectors/common/basemon.go +++ b/pkg/cloudmon/collectors/common/basemon.go @@ -61,7 +61,12 @@ func (self *CloudReportBase) GetResourceByOperator() ([]jsonutils.JSONObject, er case OSS: servers, err = self.GetAllserverOfThisProvider(&modules.Buckets, nil) case ELB: - servers, err = self.GetAllserverOfThisProvider(&modules.Loadbalancers, nil) + query := jsonutils.NewDict() + query.Add(jsonutils.NewString("0"), KEY_LIMIT) + query.Add(jsonutils.NewString("true"), KEY_ADMIN) + query.Add(jsonutils.NewString(self.SProvider.Provider), "provider") + query.Add(jsonutils.NewString(self.SProvider.Id), "manager") + servers, err = self.GetAllserverOfThisProvider(&modules.Loadbalancers, query) case K8S: query := jsonutils.NewDict() query.Add(jsonutils.NewString("0"), KEY_LIMIT)