From 7a5c1e26c22acbbe1fffe179273476c9ce942b0d Mon Sep 17 00:00:00 2001 From: gaohj Date: Tue, 10 Dec 2019 18:12:06 +0800 Subject: [PATCH] ensure get the metrics that have been aggregated --- pkg/scalers/huawei_cloudeye_scaler.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkg/scalers/huawei_cloudeye_scaler.go b/pkg/scalers/huawei_cloudeye_scaler.go index b78bb291662..12642f66a27 100644 --- a/pkg/scalers/huawei_cloudeye_scaler.go +++ b/pkg/scalers/huawei_cloudeye_scaler.go @@ -303,8 +303,8 @@ func (h *huaweiCloudeyeScaler) GetCloudeyeMetrics() (float64, error) { MetricName: h.metadata.metricsName, }, }, - From: time.Now().Add(time.Second*-1*time.Duration(h.metadata.metricCollectionTime)).UnixNano() / 1e6, - To: time.Now().UnixNano() / 1e6, + From: time.Now().Truncate(time.Minute).Add(time.Second*-1*time.Duration(h.metadata.metricCollectionTime)).UnixNano() / 1e6, + To: time.Now().Truncate(time.Minute).UnixNano() / 1e6, Period: h.metadata.metricPeriod, Filter: h.metadata.metricFilter, } @@ -323,7 +323,7 @@ func (h *huaweiCloudeyeScaler) GetCloudeyeMetrics() (float64, error) { var metricValue float64 - if metricdatas[0].Datapoints != nil { + if metricdatas[0].Datapoints != nil && len(metricdatas[0].Datapoints) > 0 { v, ok := metricdatas[0].Datapoints[0][h.metadata.metricFilter].(float64) if ok { metricValue = v