From f4f932210fef2ebe0414df9e1856281b0edd48b9 Mon Sep 17 00:00:00 2001
From: ioito <qu_xuan@icloud.com>
Date: Mon, 5 Sep 2022 16:28:36 +0800
Subject: [PATCH] fix(cloudmon): aliyun redis metric

---
 pkg/multicloud/aliyun/monitor.go | 90 ++++++++++++--------------------
 1 file changed, 32 insertions(+), 58 deletions(-)

diff --git a/pkg/multicloud/aliyun/monitor.go b/pkg/multicloud/aliyun/monitor.go
index 06604dff7a..46b569e7b9 100644
--- a/pkg/multicloud/aliyun/monitor.go
+++ b/pkg/multicloud/aliyun/monitor.go
@@ -17,6 +17,7 @@ package aliyun
 import (
 	"fmt"
 	"strconv"
+	"strings"
 	"time"
 
 	"yunion.io/x/jsonutils"
@@ -450,71 +451,44 @@ func (self *SAliyunClient) GetOssMetrics(opts *cloudprovider.MetricListOptions)
 }
 
 func (self *SAliyunClient) GetRedisMetrics(opts *cloudprovider.MetricListOptions) ([]cloudprovider.MetricValues, error) {
-	metricTags, tagKey := map[string]string{}, ""
-	switch opts.MetricType {
-	case cloudprovider.REDIS_METRIC_TYPE_CPU_USAGE:
-		metricTags = map[string]string{
-			"CpuUsage": "",
-		}
-	case cloudprovider.REDIS_METRIC_TYPE_MEM_USAGE:
-		metricTags = map[string]string{
-			"MemoryUsage": "",
-		}
-	case cloudprovider.REDIS_METRIC_TYPE_NET_BPS_RX:
-		metricTags = map[string]string{
-			"IntranetIn": "",
-		}
-	case cloudprovider.REDIS_METRIC_TYPE_NET_BPS_TX:
-		metricTags = map[string]string{
-			"IntranetOut": "",
-		}
-	case cloudprovider.REDIS_METRIC_TYPE_USED_CONN:
-		metricTags = map[string]string{
-			"UsedConnection": "",
-		}
-	case cloudprovider.REDIS_METRIC_TYPE_OPT_SES:
-		metricTags = map[string]string{
-			"UsedQPS": "",
-		}
-	case cloudprovider.REDIS_METRIC_TYPE_CACHE_KEYS:
-		metricTags = map[string]string{
-			"StandardKeys": "",
-		}
-	//case cloudprovider.REDIS_METRIC_TYPE_CACHE_EXP_KEYS:
-	//	metricTags = map[string]string{
-	//		"ExpiredKeys": "",
-	//	}
-	case cloudprovider.REDIS_METRIC_TYPE_DATA_MEM_USAGE:
-		metricTags = map[string]string{
-			"UsedMemory": "",
-		}
-	default:
+	metrics := map[cloudprovider.TMetricType]string{
+		cloudprovider.REDIS_METRIC_TYPE_CPU_USAGE:      "CpuUsage",
+		cloudprovider.REDIS_METRIC_TYPE_MEM_USAGE:      "MemoryUsage",
+		cloudprovider.REDIS_METRIC_TYPE_NET_BPS_RX:     "IntranetIn",
+		cloudprovider.REDIS_METRIC_TYPE_NET_BPS_TX:     "IntranetOut",
+		cloudprovider.REDIS_METRIC_TYPE_USED_CONN:      "UsedConnection",
+		cloudprovider.REDIS_METRIC_TYPE_OPT_SES:        "UsedQPS",
+		cloudprovider.REDIS_METRIC_TYPE_CACHE_KEYS:     "StandardKeys",
+		cloudprovider.REDIS_METRIC_TYPE_DATA_MEM_USAGE: "UsedMemory",
+	}
+	metric, ok := metrics[opts.MetricType]
+	if !ok {
 		return nil, errors.Wrapf(cloudprovider.ErrNotImplemented, "%s", opts.MetricType)
 	}
 	ret := []cloudprovider.MetricValues{}
-	for metric, tag := range metricTags {
-		result, err := self.ListMetrics("acs_kvstore", metric, opts.StartTime, opts.EndTime)
-		if err != nil {
-			log.Errorf("ListMetric(%s) error: %v", metric, err)
-			continue
-		}
+	result, err := self.ListMetrics("acs_kvstore", metric, opts.StartTime, opts.EndTime)
+	if err != nil {
+		return nil, errors.Wrapf(err, "ListMetric(%s)", metric)
+	}
+	for i := range result {
 		tags := map[string]string{}
-		if len(tag) > 0 && len(tagKey) > 0 {
-			tags[tagKey] = tag
+		if strings.Contains(result[i].InstanceId, "-db-") {
+			tags[cloudprovider.METRIC_TAG_NODE] = result[i].InstanceId
+			idx := strings.Index(result[i].InstanceId, "-db-")
+			result[i].InstanceId = result[i].InstanceId[:idx]
 		}
-		for i := range result {
-			ret = append(ret, cloudprovider.MetricValues{
-				Id:         result[i].InstanceId,
-				MetricType: opts.MetricType,
-				Values: []cloudprovider.MetricValue{
-					{
-						Timestamp: time.UnixMilli(result[i].Timestamp),
-						Value:     result[i].GetValue(),
-						Tags:      tags,
-					},
+		value := cloudprovider.MetricValues{
+			Id:         result[i].InstanceId,
+			MetricType: opts.MetricType,
+			Values: []cloudprovider.MetricValue{
+				{
+					Timestamp: time.UnixMilli(result[i].Timestamp),
+					Value:     result[i].GetValue(),
+					Tags:      tags,
 				},
-			})
+			},
 		}
+		ret = append(ret, value)
 	}
 	return ret, nil
 }