From 63bb7524ac042815e76dbce46b169a3d502a5dd2 Mon Sep 17 00:00:00 2001
From: KunfengHe <492209879@qq.com>
Date: Fri, 15 Dec 2023 17:18:21 +0800
Subject: [PATCH] add rds cpu&mem field, support input ak&sk from command line

---
 README.md                       |  18 ++-
 README_cn.md                    |  43 ++++--
 collector/apic.go               |   2 +-
 collector/apic_test.go          | 116 ++++++++++++++
 collector/apig_test.go          |  43 ++++++
 collector/as_test.go            |  23 +++
 collector/bms_test.go           |  29 ++++
 collector/cbr_test.go           |  40 +++++
 collector/cc.go                 |   6 +-
 collector/cc_test.go            |  70 +++++++++
 collector/cdm_test.go           |  37 +++++
 collector/collector_test.go     |  65 ++++++++
 collector/config.go             |  13 +-
 collector/config_test.go        |  55 +++++++
 collector/dayu_test.go          |  33 ++++
 collector/dbss_test.go          |  31 ++++
 collector/dcaas_test.go         |  23 +++
 collector/dcs_test.go           |  22 +++
 collector/ddos_test.go          |  20 +++
 collector/drs_test.go           |  20 +++
 collector/efs_test.go           |  20 +++
 collector/es_test.go            |  20 +++
 collector/evs_test.go           |  27 ++++
 collector/extensions_test.go    |  39 +++++
 collector/functiongraph_test.go |  20 +++
 collector/gaussdb_test.go       |  28 ++++
 collector/ges_test.go           |  20 +++
 collector/nat_test.go           |  20 +++
 collector/rds.go                |   8 +-
 collector/rds_test.go           |  26 ++++
 collector/rms.go                |   4 +-
 collector/utils_test.go         | 262 ++++++++++++++++++++++++++++++++
 collector/waf_test.go           |  20 +++
 go.mod                          |  27 +++-
 go.sum                          |  70 +++------
 main.go                         |  17 +++
 metric.yml                      | 177 +++++++++++----------
 37 files changed, 1365 insertions(+), 149 deletions(-)
 create mode 100644 collector/apic_test.go
 create mode 100644 collector/apig_test.go
 create mode 100644 collector/as_test.go
 create mode 100644 collector/bms_test.go
 create mode 100644 collector/cbr_test.go
 create mode 100644 collector/cc_test.go
 create mode 100644 collector/cdm_test.go
 create mode 100644 collector/collector_test.go
 create mode 100644 collector/config_test.go
 create mode 100644 collector/dayu_test.go
 create mode 100644 collector/dbss_test.go
 create mode 100644 collector/dcaas_test.go
 create mode 100644 collector/dcs_test.go
 create mode 100644 collector/ddos_test.go
 create mode 100644 collector/drs_test.go
 create mode 100644 collector/efs_test.go
 create mode 100644 collector/es_test.go
 create mode 100644 collector/evs_test.go
 create mode 100644 collector/extensions_test.go
 create mode 100644 collector/functiongraph_test.go
 create mode 100644 collector/gaussdb_test.go
 create mode 100644 collector/ges_test.go
 create mode 100644 collector/nat_test.go
 create mode 100644 collector/rds_test.go
 create mode 100644 collector/utils_test.go
 create mode 100644 collector/waf_test.go

diff --git a/README.md b/README.md
index d6b53b94..cfcd8550 100644
--- a/README.md
+++ b/README.md
@@ -33,6 +33,22 @@ The default port is 8087, default config file location is ./clouds.yml.
 Visit metrics in http://localhost:8087/metrics?services=SYS.VPC,SYS.ELB
 
 
+To avoid ak&sk leaks, you can input your ak&sk through the command line with '-s' param like this
+```shell
+./cloudeye-exporter -s true
+```
+To startup the cloudeye-exporter using script, here is an example
+```shell
+#!/bin/bash
+# Don't write plain text ak&sk in script.
+# Encrypt the ak&sk instead and use your own decrypt function to assign the return value.
+huaweiCloud_AK=your_decrypt_function("your encrypted ak")
+huaweiCloud_SK=your_decrypt_function("your encrypted sk")
+$(./cloudeye-exporter -s true<<EOF
+$huaweiCloud_AK $huaweiCloud_SK
+EOF)
+```
+
 ## Help
 ```
 Usage of ./cloudeye-exporter:
@@ -41,7 +57,7 @@ Usage of ./cloudeye-exporter:
 ```
 
 ## Example of config file(clouds.yml)
-The "URL" value can be get from [Identity and Access Management (IAM) endpoint list](https://developer.huaweicloud.com/endpoint?IAM).
+The "URL" value can be get from [Identity and Access Management (IAM) endpoint list (Internal)](https://developer.huaweicloud.com/intl/en-us/endpoint?IAM) and [Identity and Access Management (IAM) endpoint list (China)](https://developer.huaweicloud.com/endpoint?IAM).
 ```
 global:
   prefix: "huaweicloud"
diff --git a/README_cn.md b/README_cn.md
index a773f08a..0d00b139 100644
--- a/README_cn.md
+++ b/README_cn.md
@@ -60,9 +60,11 @@ Prometheus是用于展示大型测量数据的开源可视化工具，在工业
 | ECS | Ubuntu 18.04 |
 | Ubuntu private ip | 192.168.0.xx |
 
+账号要求具有IAM，CES，RMS，EPS服务的可读权限,另外获取哪些服务的监控数据就需要有哪些服务的只读权限
+
 ## 安装配置cloudeye-exporter
 1. 在ubuntu vm上安装cloudeye-exporter
-   
+
    登录vm机器，查看插件Releases版本 (https://github.com/huaweicloud/cloudeye-exporter/releases) ，获取插件下载地址，下载解压安装。
 ```
 # 参考命令：
@@ -72,22 +74,41 @@ wget https://github.com/huaweicloud/cloudeye-exporter/releases/download/v2.0.5/c
 tar -xzvf cloudeye-exporter.v2.0.5.tar.gz
 ```
 2. 编辑clouds.yml文件配置公有云信息
+
+   区域ID以及auth_url可点击下面链接查看
+ *  [地区和终端节点（中国站）](https://developer.huaweicloud.com/endpoint?IAM)
+ *  [地区和终端节点（国际站）](https://developer.huaweicloud.com/intl/en-us/endpoint?IAM)
 ```
 global:
-  port: ":8087"
+  port: ":8087" # 监听端口 :8087代表在全部网络接口上开启监听8087端口，限定内部访问也可以指定IP例如：192.168.1.100:8087
   scrape_batch_size: 300
 auth:
   auth_url: "https://iam.{region_id}.myhuaweicloud.com/v3"
-  project_name: "cn-north-1"
-  access_key: ""
+  project_name: "cn-north-1" # 华为云项目名称，可以在“华为云->统一身份认证服务->项目”中查看
+  access_key: "" # IAM用户访问密钥 您可参考3.1章节使用命令行输入加密后的ak sk，避免在配置文件中明文配置AK SK
   secret_key: ""
-  region: "cn-north-1"
+  region: "cn-north-1" # 区域ID
 ```
 注：默认的监控端口为8087.
 
-3. 启动cloudeye-exporter
+3. 启动cloudeye-exporter，默认读取当前目录下的clouds.yml文件，也可使用-config参数指定clouds.yml文件路径
+```
+./cloudeye-exporter -config=clouds.yml
+```
+
+3.1 出于安全考虑cloudeye-exporter提供了 -s参数, 可以通过命令行交互的方式输入ak sk避免明文配置在clouds.yml文件中引起泄露
+```shell
+./cloudeye-exporter -s true
 ```
-./cloudeye-exporter
+下面是shell脚本启动的样例，建议在脚本中配置加密后的ak&sk，并通过您自己的解密方法对ak sk进行解密后通过huaweiCloud_AK和huaweiCloud_SK参数传入cloudeye-exporter
+```shell
+#!/bin/bash
+## 为了防止您的ak&sk泄露，不建议在脚本中配置明文的ak sk
+huaweiCloud_AK=your_decrypt_function("加密的AK")
+huaweiCloud_SK=your_decrypt_function("加密的SK")
+$(./cloudeye-exporter -s true<<EOF
+$huaweiCloud_AK $huaweiCloud_SK
+EOF)
 ```
 
 ## 安装配置prometheus接入cloudeye
@@ -103,14 +124,14 @@ $ cd prometheus-2.14.0.linux-amd64
    ```
    $ vi prometheus.yml
    global:
-     scrape_interval: 1m # Set the scrape interval to every 1 minute seconds. Default is every 1 minute.
-     scrape_timeout: 1m
+     scrape_interval: 1m # 设置prometheus从exporter查询数据的间隔时间，prometheus配置文件中默认为15s，建议设置为1m
+     scrape_timeout: 1m # 设置从exporter查询数据的超时时间，prometheus配置文件中默认为15s，建议设置为1m
    scrape_configs:
      - job_name: 'huaweicloud'
        static_configs:
-       - targets: ['192.168.0.xx:8087']
+       - targets: ['192.168.0.xx:8087'] # exporter节点地址:监听端口
        params:
-         services: ['SYS.VPC,SYS.RDS']
+         services: ['SYS.VPC,SYS.RDS'] # 当前任务需要查询的服务命名空间，建议每个服务配置单独job
    ```
 3. 启动prometheus监控华为云服务
 ```
diff --git a/collector/apic.go b/collector/apic.go
index 8dcdb8e8..1f9d569e 100644
--- a/collector/apic.go
+++ b/collector/apic.go
@@ -69,7 +69,7 @@ func buildApisInfo(instanceId string, resourceInfos map[string]labelInfo, filter
 		*filterMetrics = append(*filterMetrics, metrics...)
 		appInfo := labelInfo{
 			Name:  []string{"appName", "groupName", "groupId", "reqMethod", "reqUri"},
-			Value: []string{api.Name, getDefaultString(api.GroupName), getDefaultString(api.GroupName), api.ReqMethod.Value(), api.ReqUri},
+			Value: []string{api.Name, getDefaultString(api.GroupName), api.GroupId, api.ReqMethod.Value(), api.ReqUri},
 		}
 		appInfo.Name = append(appInfo.Name, instanceInfo.Name...)
 		appInfo.Value = append(appInfo.Value, instanceInfo.Value...)
diff --git a/collector/apic_test.go b/collector/apic_test.go
new file mode 100644
index 00000000..a4a63e5c
--- /dev/null
+++ b/collector/apic_test.go
@@ -0,0 +1,116 @@
+package collector
+
+import (
+	"testing"
+
+	"github.com/agiledragon/gomonkey/v2"
+	"github.com/huaweicloud/huaweicloud-sdk-go-v3/services/apig/v2/model"
+	"github.com/stretchr/testify/assert"
+)
+
+func TestShowDetailsOfInstanceV2(t *testing.T) {
+	apigClient := getAPICSClient()
+	id := "0001-0001-0000001"
+	name := "instance01"
+	instanceInfo := model.ShowDetailsOfInstanceV2Response{
+		Id:           &id,
+		InstanceName: &name,
+	}
+	patches := gomonkey.ApplyMethodReturn(apigClient, "ShowDetailsOfInstanceV2", &instanceInfo, nil)
+	defer patches.Reset()
+	resp, err := showDetailsOfInstanceV2(id)
+	assert.Equal(t, true, err == nil)
+	assert.Equal(t, name, *resp.InstanceName)
+}
+
+func TestGetResourceInfo(t *testing.T) {
+	var (
+		id       = "0001-0001-000001"
+		name     = "instance01"
+		eip      = "*.*.*.*"
+		epId     = "0"
+		apiId    = "api0000001"
+		emptyStr = ""
+	)
+
+	sysConfig := map[string][]string{
+		"instance_id":         {"requests"},
+		"instance_id,api_id":  {"req_count"},
+		"instance_id,node_ip": {"node_qps"},
+	}
+
+	instances := []model.RespInstanceBase{{Id: &id, InstanceName: &name, EipAddress: &eip, EnterpriseProjectId: &epId}}
+	apis := []model.ApiInfoPerPage{{Id: &apiId, Name: "api1", GroupName: &emptyStr, GroupId: "group1"}}
+	instance := model.ShowDetailsOfInstanceV2Response{
+		NodeIps: &model.NodeIps{
+			Livedata: &[]string{"*.*.*.2"},
+			Shubao:   &[]string{"*.*.*.3"},
+		},
+	}
+
+	patches := gomonkey.ApplyFuncReturn(getMetricConfigMap, sysConfig)
+	patches.ApplyFuncReturn(getAllAPICInstances, instances, nil)
+	patches.ApplyFuncReturn(getApisOfInstances, apis, nil)
+	patches.ApplyFuncReturn(showDetailsOfInstanceV2, &instance, nil)
+	defer patches.Reset()
+	var getter = APICInfo{}
+	label, metrics := getter.GetResourceInfo()
+	assert.Equal(t, 4, len(label))
+	assert.Equal(t, 4, len(metrics))
+}
+
+func TestGetAllAPICInstances(t *testing.T) {
+	var (
+		id   = "0001-0001-000001"
+		name = "instance01"
+	)
+	respPage1 := model.ListInstancesV2Response{
+		HttpStatusCode: 200,
+		Instances: &[]model.RespInstanceBase{
+			{Id: &id, InstanceName: &name},
+		},
+	}
+	respPage2 := model.ListInstancesV2Response{
+		HttpStatusCode: 200,
+		Instances:      &[]model.RespInstanceBase{},
+	}
+	apicClient := getAPICSClient()
+	patches := gomonkey.ApplyMethodFunc(apicClient, "ListInstancesV2", func(req *model.ListInstancesV2Request) (*model.ListInstancesV2Response, error) {
+		if *req.Offset == 0 {
+			return &respPage1, nil
+		}
+		return &respPage2, nil
+	})
+	defer patches.Reset()
+	instances, err := getAllAPICInstances()
+	assert.Equal(t, true, err == nil)
+	assert.Equal(t, 1, len(instances))
+}
+
+func TestGetApisOfInstances(t *testing.T) {
+	var (
+		id   = "0001-0001-000001"
+		name = "api01"
+	)
+	respPage1 := model.ListApisV2Response{
+		HttpStatusCode: 200,
+		Apis: &[]model.ApiInfoPerPage{
+			{Id: &id, Name: name},
+		},
+	}
+	respPage2 := model.ListApisV2Response{
+		HttpStatusCode: 200,
+		Apis:           &[]model.ApiInfoPerPage{},
+	}
+	apicClient := getAPICSClient()
+	patches := gomonkey.ApplyMethodFunc(apicClient, "ListApisV2", func(req *model.ListApisV2Request) (*model.ListApisV2Response, error) {
+		if *req.Offset == 0 {
+			return &respPage1, nil
+		}
+		return &respPage2, nil
+	})
+	defer patches.Reset()
+	apis, err := getApisOfInstances("00001")
+	assert.Equal(t, true, err == nil)
+	assert.Equal(t, 1, len(apis))
+}
diff --git a/collector/apig_test.go b/collector/apig_test.go
new file mode 100644
index 00000000..f9c95697
--- /dev/null
+++ b/collector/apig_test.go
@@ -0,0 +1,43 @@
+package collector
+
+import (
+	"errors"
+	"testing"
+
+	"github.com/agiledragon/gomonkey/v2"
+	"github.com/huaweicloud/huaweicloud-sdk-go-v3/core/def"
+	"github.com/stretchr/testify/assert"
+)
+
+func TestApiGGetResourceInfo(t *testing.T) {
+	respPage1 := ListAppsResponse{
+		HttpStatusCode: 200,
+		Apps: &[]Apps{
+			{ID: "app-0001", Name: "app1"},
+		},
+	}
+	respPage2 := ListAppsResponse{
+		HttpStatusCode: 200,
+		Apps:           &[]Apps{},
+	}
+	sysConfig := map[string][]string{"api_id": {"req_count"}}
+
+	apigClient := getAPIGSClient()
+	patches := gomonkey.ApplyFuncReturn(getMetricConfigMap, sysConfig)
+	patches.ApplyMethodFunc(apigClient.HcClient, "Sync", func(req interface{}, reqDef *def.HttpRequestDef) (interface{}, error) {
+		request, ok := req.(*ListAppsRequest)
+		if !ok {
+			return nil, errors.New("test error")
+		}
+		if *request.Offset == 0 {
+			return &respPage1, nil
+		}
+		return &respPage2, nil
+	})
+	defer patches.Reset()
+
+	var getter APIGInfo
+	labels, metrics := getter.GetResourceInfo()
+	assert.Equal(t, 1, len(labels))
+	assert.Equal(t, 1, len(metrics))
+}
diff --git a/collector/as_test.go b/collector/as_test.go
new file mode 100644
index 00000000..11902cfe
--- /dev/null
+++ b/collector/as_test.go
@@ -0,0 +1,23 @@
+package collector
+
+import (
+	"testing"
+
+	"github.com/agiledragon/gomonkey/v2"
+	"github.com/stretchr/testify/assert"
+)
+
+func TestAsGetResourceInfo(t *testing.T) {
+	sysConfig := map[string][]string{"AutoScalingGroup": {"req_count"}}
+	groups := []ResourceBaseInfo{
+		{ID: "0001-0001-000000001", Name: "group01", EpId: "0"},
+	}
+	patches := gomonkey.ApplyFuncReturn(getMetricConfigMap, sysConfig)
+	patches.ApplyFuncReturn(getResourcesBaseInfoFromRMS, groups, nil)
+	defer patches.Reset()
+
+	var asGetter ASInfo
+	labels, metrics := asGetter.GetResourceInfo()
+	assert.Equal(t, 1, len(labels))
+	assert.Equal(t, 1, len(metrics))
+}
diff --git a/collector/bms_test.go b/collector/bms_test.go
new file mode 100644
index 00000000..063874d8
--- /dev/null
+++ b/collector/bms_test.go
@@ -0,0 +1,29 @@
+package collector
+
+import (
+	"testing"
+
+	"github.com/agiledragon/gomonkey/v2"
+	"github.com/stretchr/testify/assert"
+)
+
+func TestBmsGetResourceInfo(t *testing.T) {
+	sysConfig := map[string][]string{"instance_id": {"cpu_utils"}}
+	instances := []EcsInstancesInfo{
+		{ResourceBaseInfo: ResourceBaseInfo{ID: "0001-0001-000000001", Name: "host01", EpId: "0"}},
+	}
+	patches := gomonkey.ApplyFuncReturn(getMetricConfigMap, sysConfig)
+	patches.ApplyFuncReturn(getAllServerFromRMS, instances, nil)
+	patches.ApplyFunc(loadAgentDimensions, func(_ string) { return })
+	patches.ApplyFuncReturn(getIPFromEcsInfo, "")
+	defer patches.Reset()
+
+	var bmsGetter BMSInfo
+	labels, metrics := bmsGetter.GetResourceInfo()
+	assert.Equal(t, 1, len(labels))
+	assert.Equal(t, 1, len(metrics))
+
+	var servicesGetter SERVICEBMSInfo
+	serviceLabel, _ := servicesGetter.GetResourceInfo()
+	assert.Equal(t, 1, len(serviceLabel))
+}
diff --git a/collector/cbr_test.go b/collector/cbr_test.go
new file mode 100644
index 00000000..562adb76
--- /dev/null
+++ b/collector/cbr_test.go
@@ -0,0 +1,40 @@
+package collector
+
+import (
+	"testing"
+
+	"github.com/agiledragon/gomonkey/v2"
+	"github.com/huaweicloud/huaweicloud-sdk-go-v3/services/cbr/v1/model"
+	"github.com/stretchr/testify/assert"
+)
+
+func TestCbrGetResourceInfo(t *testing.T) {
+	defaultEpId := "0"
+	respPage1 := model.ListVaultResponse{
+		HttpStatusCode: 200,
+		Vaults: &[]model.Vault{
+			{Id: "app-0001", Name: "app1", EnterpriseProjectId: &defaultEpId},
+		},
+	}
+	respPage2 := model.ListVaultResponse{
+		HttpStatusCode: 200,
+		Vaults:         &[]model.Vault{},
+	}
+	sysConfig := map[string][]string{"instance_id": {"vault_util"}}
+
+	cbrClient := getCBRClient()
+	patches := gomonkey.ApplyFuncReturn(getMetricConfigMap, sysConfig)
+	patches.ApplyFuncReturn(getResourceFromRMS, false)
+	patches.ApplyMethodFunc(cbrClient, "ListVault", func(req *model.ListVaultRequest) (*model.ListVaultResponse, error) {
+		if *req.Offset == 0 {
+			return &respPage1, nil
+		}
+		return &respPage2, nil
+	})
+	defer patches.Reset()
+
+	var cbrgetter CBRInfo
+	labels, metrics := cbrgetter.GetResourceInfo()
+	assert.Equal(t, 1, len(labels))
+	assert.Equal(t, 1, len(metrics))
+}
diff --git a/collector/cc.go b/collector/cc.go
index 33772f87..349e8b56 100644
--- a/collector/cc.go
+++ b/collector/cc.go
@@ -7,7 +7,7 @@ import (
 	"github.com/huaweicloud/huaweicloud-sdk-go-v3/core/auth/global"
 	cc "github.com/huaweicloud/huaweicloud-sdk-go-v3/services/cc/v3"
 	"github.com/huaweicloud/huaweicloud-sdk-go-v3/services/cc/v3/model"
-	region "github.com/huaweicloud/huaweicloud-sdk-go-v3/services/cc/v3/region"
+	"github.com/huaweicloud/huaweicloud-sdk-go-v3/services/cc/v3/region"
 	cesmodel "github.com/huaweicloud/huaweicloud-sdk-go-v3/services/ces/v1/model"
 
 	"github.com/huaweicloud/cloudeye-exporter/logs"
@@ -142,7 +142,7 @@ func listBandwidthPackages() (map[string]model.BandwidthPackage, error) {
 	for {
 		response, err := client.ListBandwidthPackages(request)
 		if err != nil {
-			fmt.Println(err.Error())
+			logs.Logger.Errorf("Failed to list BandwidthPackages, error: %s", err.Error())
 			return bandwidthPackages, err
 		}
 		for _, bandwidthPackage := range *response.BandwidthPackages {
@@ -168,7 +168,7 @@ func listInterRegionBandwidths() ([]model.InterRegionBandwidth, error) {
 	for {
 		response, err := client.ListInterRegionBandwidths(request)
 		if err != nil {
-			fmt.Println(err.Error())
+			logs.Logger.Errorf("Failed to list InterRegionBandwidths, error: %s", err.Error())
 			return resources, err
 		}
 		resources = append(resources, *response.InterRegionBandwidths...)
diff --git a/collector/cc_test.go b/collector/cc_test.go
new file mode 100644
index 00000000..4fa82001
--- /dev/null
+++ b/collector/cc_test.go
@@ -0,0 +1,70 @@
+package collector
+
+import (
+	"testing"
+
+	"github.com/agiledragon/gomonkey/v2"
+	cc "github.com/huaweicloud/huaweicloud-sdk-go-v3/services/cc/v3"
+	"github.com/huaweicloud/huaweicloud-sdk-go-v3/services/cc/v3/model"
+	"github.com/stretchr/testify/assert"
+)
+
+func TestCCGetResourceInfo(t *testing.T) {
+	sysConfig := map[string][]string{CCConfigDimNames: {"network_incoming_bits_rate"}}
+	patches := gomonkey.ApplyFuncReturn(getMetricConfigMap, sysConfig)
+
+	defaultEpId := "0"
+	id := "connection-0001"
+	name := "connection1"
+	connectionsPage := model.ListCloudConnectionsResponse{
+		HttpStatusCode: 200,
+		CloudConnections: &[]model.CloudConnection{
+			{Id: &id, Name: &name, EnterpriseProjectId: &defaultEpId},
+		},
+		PageInfo: &model.PageInfo{},
+	}
+
+	ccClient := cc.CcClient{}
+	patches.ApplyFuncReturn(getCCClient, &ccClient)
+	patches.ApplyMethodFunc(&ccClient, "ListCloudConnections", func(req *model.ListCloudConnectionsRequest) (*model.ListCloudConnectionsResponse, error) {
+		return &connectionsPage, nil
+	})
+
+	packagesPage := model.ListBandwidthPackagesResponse{
+		HttpStatusCode: 200,
+		BandwidthPackages: &[]model.BandwidthPackage{
+			{Id: &id, Name: &name, EnterpriseProjectId: &defaultEpId},
+		},
+		PageInfo: &model.PageInfo{},
+	}
+	patches.ApplyMethodFunc(&ccClient, "ListBandwidthPackages", func(req *model.ListBandwidthPackagesRequest) (*model.ListBandwidthPackagesResponse, error) {
+		return &packagesPage, nil
+	})
+	defer patches.Reset()
+
+	localRegionId := "cn-test-01"
+	remoteRegionId := "cn-test-02"
+	bandwidthsPage := model.ListInterRegionBandwidthsResponse{
+		HttpStatusCode: 200,
+		InterRegionBandwidths: &[]model.InterRegionBandwidth{
+			{
+				Id:                 &id,
+				Name:               &name,
+				CloudConnectionId:  &id,
+				BandwidthPackageId: &id,
+				InterRegions: &[]model.InterRegion{
+					{LocalRegionId: &localRegionId, RemoteRegionId: &remoteRegionId},
+				}},
+		},
+		PageInfo: &model.PageInfo{},
+	}
+	patches.ApplyMethodFunc(&ccClient, "ListInterRegionBandwidths", func(req *model.ListInterRegionBandwidthsRequest) (*model.ListInterRegionBandwidthsResponse, error) {
+		return &bandwidthsPage, nil
+	})
+	defer patches.Reset()
+
+	var ccgetter CCInfo
+	labels, metrics := ccgetter.GetResourceInfo()
+	assert.Equal(t, 1, len(labels))
+	assert.Equal(t, 1, len(metrics))
+}
diff --git a/collector/cdm_test.go b/collector/cdm_test.go
new file mode 100644
index 00000000..152615d4
--- /dev/null
+++ b/collector/cdm_test.go
@@ -0,0 +1,37 @@
+package collector
+
+import (
+	"testing"
+
+	"github.com/agiledragon/gomonkey/v2"
+	"github.com/huaweicloud/huaweicloud-sdk-go-v3/services/cdm/v1/model"
+	"github.com/stretchr/testify/assert"
+)
+
+func TestCDMGetResourceInfo(t *testing.T) {
+	sysConfig := map[string][]string{"instance_id": {"cpu_usage"}}
+	patches := gomonkey.ApplyFuncReturn(getMetricConfigMap, sysConfig)
+	connectionsPage := model.ListClustersResponse{
+		HttpStatusCode: 200,
+		Clusters: &[]model.Clusters{
+			{
+				Id:   "cluster-00001",
+				Name: "cluster1",
+				Instances: &[]model.ClusterDetailInstance{
+					{Id: "instance-00001", Name: "instance1"},
+				},
+			},
+		},
+	}
+	cdmClient := getCDMClient()
+	patches.ApplyMethodFunc(cdmClient, "ListClusters", func(req *model.ListClustersRequest) (*model.ListClustersResponse, error) {
+		return &connectionsPage, nil
+	})
+
+	defer patches.Reset()
+
+	var cdmgetter CDMInfo
+	labels, metrics := cdmgetter.GetResourceInfo()
+	assert.Equal(t, 1, len(labels))
+	assert.Equal(t, 1, len(metrics))
+}
diff --git a/collector/collector_test.go b/collector/collector_test.go
new file mode 100644
index 00000000..e24391e1
--- /dev/null
+++ b/collector/collector_test.go
@@ -0,0 +1,65 @@
+package collector
+
+import (
+	"testing"
+	"time"
+
+	"github.com/huaweicloud/huaweicloud-sdk-go-v3/services/ces/v1/model"
+	"github.com/stretchr/testify/assert"
+)
+
+func TestReplaceName(t *testing.T) {
+	assert.Equal(t, "sys_ecs", replaceName("SYS.ECS"))
+}
+
+func TestGetLabel(t *testing.T) {
+	ns := "SYS.ECS"
+	avg := 23.5
+	unit := "%"
+	metric := model.BatchMetricData{
+		Namespace:  &ns,
+		MetricName: "cpu_utils",
+		Dimensions: &[]model.MetricsDimension{
+			{Name: "instance_id", Value: "0001-0001-0000001"},
+		},
+		Datapoints: []model.DatapointForBatchMetric{
+			{Average: &avg, Timestamp: time.Now().Unix() * 1000},
+		},
+		Unit: &unit,
+	}
+	info := map[string]labelInfo{
+		"0001-0001-0000001": {Name: []string{"name"}, Value: []string{"host01"}},
+	}
+	label := getLabel(metric, info)
+	assert.Equal(t, 3, len(label.Name))
+	assert.Equal(t, 3, len(label.Value))
+}
+
+func TestGetDimValue(t *testing.T) {
+	assert.Equal(t, "0001-0001-0000001", getDimValue("SYS.ECS", "instance_id", "0001-0001-0000001"))
+	assert.Equal(t, "0001-0001-0000001", getDimValue("AGT.ECS", "instance_id", "0001-0001-0000001"))
+	assert.Equal(t, "000000000000000", getDimValue("AGT.ECS", "disk", "000000000000000"))
+	agentDimensions.Store("000000000000000", "vda")
+	assert.Equal(t, "vda", getDimValue("AGT.ECS", "disk", "000000000000000"))
+}
+
+func TestTransMetric(t *testing.T) {
+	metricInfoList := model.MetricInfoList{
+		Namespace: "SYS.ECS",
+	}
+	assert.Equal(t, "SYS.ECS", transMetric(metricInfoList).Namespace)
+}
+
+func TestGetLatestData(t *testing.T) {
+	value, err := getLatestData([]model.DatapointForBatchMetric{})
+	assert.Equal(t, true, value == 0)
+	assert.Equal(t, "data not found", err.Error())
+	avg1, avg2 := 23.5, 63.52
+	data := []model.DatapointForBatchMetric{
+		{Average: &avg1, Timestamp: time.Now().Unix()*1000 - 1000*60},
+		{Average: &avg2, Timestamp: time.Now().Unix() * 1000},
+	}
+	value, err = getLatestData(data)
+	assert.Equal(t, true, err == nil)
+	assert.Equal(t, avg2, value)
+}
diff --git a/collector/config.go b/collector/config.go
index eaa427c4..c639f042 100644
--- a/collector/config.go
+++ b/collector/config.go
@@ -41,6 +41,9 @@ type CloudConfig struct {
 }
 
 var CloudConf CloudConfig
+var SecurityMod bool
+var TmpAK string
+var TmpSK string
 
 func InitCloudConf(file string) error {
 	data, err := ioutil.ReadFile(file)
@@ -142,12 +145,18 @@ func InitConfig() error {
 	conf.IdentityEndpoint = CloudConf.Auth.AuthURL
 	conf.ProjectName = CloudConf.Auth.ProjectName
 	conf.ProjectID = CloudConf.Auth.ProjectID
-	conf.AccessKey = CloudConf.Auth.AccessKey
-	conf.SecretKey = CloudConf.Auth.SecretKey
 	conf.DomainName = CloudConf.Auth.DomainName
 	conf.Username = CloudConf.Auth.UserName
 	conf.Region = CloudConf.Auth.Region
 	conf.Password = CloudConf.Auth.Password
+	if SecurityMod {
+		conf.AccessKey = TmpAK
+		conf.SecretKey = TmpSK
+	} else {
+		conf.AccessKey = CloudConf.Auth.AccessKey
+		conf.SecretKey = CloudConf.Auth.SecretKey
+	}
+
 	if conf.ProjectID == "" && conf.ProjectName == "" {
 		logs.Logger.Error("Init config error: ProjectID or ProjectName must setting.")
 		return errors.New("init config error: ProjectID or ProjectName must setting")
diff --git a/collector/config_test.go b/collector/config_test.go
new file mode 100644
index 00000000..5e70f33d
--- /dev/null
+++ b/collector/config_test.go
@@ -0,0 +1,55 @@
+package collector
+
+import (
+	"testing"
+
+	"github.com/stretchr/testify/assert"
+)
+
+func TestName(t *testing.T) {
+	err := InitMetricConf()
+	assert.Equal(t, true, err != nil)
+	metricConf = map[string]MetricConf{
+		"SYS.ECS": {
+			Resource: "rms",
+			DimMetricName: map[string][]string{
+				"instance_id": []string{"cpu_util", "mem_util", "disk_util_inband"},
+			},
+		},
+	}
+	mconf := getMetricConfigMap("TEST.ECS")
+	assert.Equal(t, true, mconf == nil)
+
+	mconf = getMetricConfigMap("SYS.ECS")
+	assert.Equal(t, 1, len(mconf))
+}
+
+func TestInitConfigSecurityModIsTrue(t *testing.T) {
+	SecurityMod = true
+	TmpSK = "tmpSK"
+	TmpAK = "tmpAK"
+	CloudConf.Auth.ProjectID = "testProjectId"
+	CloudConf.Auth.ProjectName = "testProjectName"
+	err := InitConfig()
+	if err != nil {
+		return
+	}
+
+	assert.Equal(t, TmpAK, conf.AccessKey)
+	assert.Equal(t, TmpSK, conf.SecretKey)
+}
+
+func TestInitConfigSecurityModIsFalse(t *testing.T) {
+	SecurityMod = false
+	CloudConf.Auth.AccessKey = "tmpSK"
+	CloudConf.Auth.SecretKey = "tmpAK"
+	CloudConf.Auth.ProjectID = "testProjectId"
+	CloudConf.Auth.ProjectName = "testProjectName"
+	err := InitConfig()
+	if err != nil {
+		return
+	}
+
+	assert.Equal(t, CloudConf.Auth.AccessKey, conf.AccessKey)
+	assert.Equal(t, CloudConf.Auth.SecretKey, conf.SecretKey)
+}
diff --git a/collector/dayu_test.go b/collector/dayu_test.go
new file mode 100644
index 00000000..c04aa38d
--- /dev/null
+++ b/collector/dayu_test.go
@@ -0,0 +1,33 @@
+package collector
+
+import (
+	"testing"
+
+	"github.com/agiledragon/gomonkey/v2"
+	"github.com/huaweicloud/huaweicloud-sdk-go-v3/core"
+	"github.com/huaweicloud/huaweicloud-sdk-go-v3/core/def"
+	"github.com/stretchr/testify/assert"
+)
+
+func TestDayuGetResourceInfo(t *testing.T) {
+	sysConfig := map[string][]string{"stream_id": {"dis11_stream_record_retention_time"}}
+	patches := gomonkey.ApplyFuncReturn(getMetricConfigMap, sysConfig)
+	dayuClient := &core.HcHttpClient{}
+	patches.ApplyFuncReturn(getHcClient, dayuClient)
+	resp := ListStreamsResp{
+		HttpStatusCode: 200,
+		HasMoreStreams: false,
+		StreamInfoList: []StreamInfo{
+			{StreamID: "stream-0001-0001", StreamName: "Stream01"},
+		},
+	}
+	patches.ApplyMethodFunc(dayuClient, "Sync", func(req interface{}, reqDef *def.HttpRequestDef) (interface{}, error) {
+		return &resp, nil
+	})
+	defer patches.Reset()
+
+	var dayugetter DayuInfo
+	labels, metrics := dayugetter.GetResourceInfo()
+	assert.Equal(t, 1, len(labels))
+	assert.Equal(t, 1, len(metrics))
+}
diff --git a/collector/dbss_test.go b/collector/dbss_test.go
new file mode 100644
index 00000000..f5d7944f
--- /dev/null
+++ b/collector/dbss_test.go
@@ -0,0 +1,31 @@
+package collector
+
+import (
+	"testing"
+
+	"github.com/agiledragon/gomonkey/v2"
+	"github.com/huaweicloud/huaweicloud-sdk-go-v3/services/rms/v1/model"
+	"github.com/stretchr/testify/assert"
+)
+
+func TestDBssGetResourceInfo(t *testing.T) {
+	sysConfig := map[string][]string{"audit_id": {"cpu_util"}}
+	patches := gomonkey.ApplyFuncReturn(getMetricConfigMap, sysConfig)
+	patches.ApplyFuncReturn(listResources, mockRmsResource(), nil)
+	defer patches.Reset()
+
+	var dbssgetter DBSSInfo
+	labels, metrics := dbssgetter.GetResourceInfo()
+	assert.Equal(t, 1, len(labels))
+	assert.Equal(t, 1, len(metrics))
+}
+
+func mockRmsResource() []model.ResourceEntity {
+	id := "0001-0001-000001"
+	name := "resource1"
+	epId := "0"
+	resp := []model.ResourceEntity{
+		{Id: &id, Name: &name, EpId: &epId},
+	}
+	return resp
+}
diff --git a/collector/dcaas_test.go b/collector/dcaas_test.go
new file mode 100644
index 00000000..531fa6e4
--- /dev/null
+++ b/collector/dcaas_test.go
@@ -0,0 +1,23 @@
+package collector
+
+import (
+	"testing"
+
+	"github.com/agiledragon/gomonkey/v2"
+	"github.com/stretchr/testify/assert"
+)
+
+func TestDcaassGetResourceInfo(t *testing.T) {
+	sysConfig := map[string][]string{
+		"virtual_gateway_id":   {"network_incoming_bits_rate"},
+		"virtual_interface_id": {"network_incoming_bits_rate"},
+		"direct_connect_id":    {"network_incoming_bits_rate"}}
+	patches := gomonkey.ApplyFuncReturn(getMetricConfigMap, sysConfig)
+	patches.ApplyFuncReturn(listResources, mockRmsResource(), nil)
+	defer patches.Reset()
+
+	var dcaasgetter DCAASInfo
+	labels, metrics := dcaasgetter.GetResourceInfo()
+	assert.Equal(t, 1, len(labels))
+	assert.Equal(t, 3, len(metrics))
+}
diff --git a/collector/dcs_test.go b/collector/dcs_test.go
new file mode 100644
index 00000000..219128df
--- /dev/null
+++ b/collector/dcs_test.go
@@ -0,0 +1,22 @@
+package collector
+
+import (
+	"testing"
+
+	"github.com/agiledragon/gomonkey/v2"
+	"github.com/stretchr/testify/assert"
+)
+
+func TestDcsGetResourceInfo(t *testing.T) {
+	sysConfig := map[string][]string{
+		"dcs_instance_id":           {"cpu_usage"},
+		"dcs_memcached_instance_id": {"cpu_usage"}}
+	patches := gomonkey.ApplyFuncReturn(getMetricConfigMap, sysConfig)
+	patches.ApplyFuncReturn(listResources, mockRmsResource(), nil)
+	defer patches.Reset()
+
+	var dcsgetter DCSInfo
+	labels, metrics := dcsgetter.GetResourceInfo()
+	assert.Equal(t, 1, len(labels))
+	assert.Equal(t, 2, len(metrics))
+}
diff --git a/collector/ddos_test.go b/collector/ddos_test.go
new file mode 100644
index 00000000..4f2e0282
--- /dev/null
+++ b/collector/ddos_test.go
@@ -0,0 +1,20 @@
+package collector
+
+import (
+	"testing"
+
+	"github.com/agiledragon/gomonkey/v2"
+	"github.com/stretchr/testify/assert"
+)
+
+func TestDdosGetResourceInfo(t *testing.T) {
+	sysConfig := map[string][]string{"instance_id": {"instance_drop_rate"}}
+	patches := gomonkey.ApplyFuncReturn(getMetricConfigMap, sysConfig)
+	patches.ApplyFuncReturn(listResources, mockRmsResource(), nil)
+	defer patches.Reset()
+
+	var ddosgetter DDOSInfo
+	labels, metrics := ddosgetter.GetResourceInfo()
+	assert.Equal(t, 1, len(labels))
+	assert.Equal(t, 1, len(metrics))
+}
diff --git a/collector/drs_test.go b/collector/drs_test.go
new file mode 100644
index 00000000..a2fbd1cb
--- /dev/null
+++ b/collector/drs_test.go
@@ -0,0 +1,20 @@
+package collector
+
+import (
+	"testing"
+
+	"github.com/agiledragon/gomonkey/v2"
+	"github.com/stretchr/testify/assert"
+)
+
+func TestDrsGetResourceInfo(t *testing.T) {
+	sysConfig := map[string][]string{"instance_id": {"cpu_util"}}
+	patches := gomonkey.ApplyFuncReturn(getMetricConfigMap, sysConfig)
+	patches.ApplyFuncReturn(listResources, mockRmsResource(), nil)
+	defer patches.Reset()
+
+	var drsgetter DRSInfo
+	labels, metrics := drsgetter.GetResourceInfo()
+	assert.Equal(t, 1, len(labels))
+	assert.Equal(t, 5, len(metrics))
+}
diff --git a/collector/efs_test.go b/collector/efs_test.go
new file mode 100644
index 00000000..c534a6dd
--- /dev/null
+++ b/collector/efs_test.go
@@ -0,0 +1,20 @@
+package collector
+
+import (
+	"testing"
+
+	"github.com/agiledragon/gomonkey/v2"
+	"github.com/stretchr/testify/assert"
+)
+
+func TestEfsGetResourceInfo(t *testing.T) {
+	sysConfig := map[string][]string{"efs_instance_id": {"client_connections"}}
+	patches := gomonkey.ApplyFuncReturn(getMetricConfigMap, sysConfig)
+	patches.ApplyFuncReturn(listResources, mockRmsResource(), nil)
+	defer patches.Reset()
+
+	var efsgetter EFSInfo
+	labels, metrics := efsgetter.GetResourceInfo()
+	assert.Equal(t, 1, len(labels))
+	assert.Equal(t, 1, len(metrics))
+}
diff --git a/collector/es_test.go b/collector/es_test.go
new file mode 100644
index 00000000..0580b1bc
--- /dev/null
+++ b/collector/es_test.go
@@ -0,0 +1,20 @@
+package collector
+
+import (
+	"testing"
+
+	"github.com/agiledragon/gomonkey/v2"
+	"github.com/stretchr/testify/assert"
+)
+
+func TestEsGetResourceInfo(t *testing.T) {
+	sysConfig := map[string][]string{"cluster_id": {"disk_util"}}
+	patches := gomonkey.ApplyFuncReturn(getMetricConfigMap, sysConfig)
+	patches.ApplyFuncReturn(listResources, mockRmsResource(), nil)
+	defer patches.Reset()
+
+	var esgetter ESInfo
+	labels, metrics := esgetter.GetResourceInfo()
+	assert.Equal(t, 1, len(labels))
+	assert.Equal(t, 1, len(metrics))
+}
diff --git a/collector/evs_test.go b/collector/evs_test.go
new file mode 100644
index 00000000..3601b04d
--- /dev/null
+++ b/collector/evs_test.go
@@ -0,0 +1,27 @@
+package collector
+
+import (
+	"testing"
+
+	"github.com/agiledragon/gomonkey/v2"
+	"github.com/stretchr/testify/assert"
+)
+
+func TestEvsGetResourceInfo(t *testing.T) {
+	sysConfig := map[string][]string{"disk_name": {"disk_device_read_bytes_rate"}}
+	patches := gomonkey.ApplyFuncReturn(getMetricConfigMap, sysConfig)
+	patches.ApplyFuncReturn(getResourceFromRMS, true)
+	volumes := mockRmsResource()
+	volumes[0].Properties = map[string]interface{}{
+		"attachments": []Attachment{
+			{Device: "vad", ServerId: "0001-0001-00000001"},
+		},
+	}
+	patches.ApplyFuncReturn(listResources, volumes, nil)
+	defer patches.Reset()
+
+	var evsgetter EVSInfo
+	labels, metrics := evsgetter.GetResourceInfo()
+	assert.Equal(t, 1, len(labels))
+	assert.Equal(t, 1, len(metrics))
+}
diff --git a/collector/extensions_test.go b/collector/extensions_test.go
new file mode 100644
index 00000000..fb77c7f2
--- /dev/null
+++ b/collector/extensions_test.go
@@ -0,0 +1,39 @@
+package collector
+
+import (
+	"testing"
+
+	"github.com/agiledragon/gomonkey/v2"
+	"github.com/huaweicloud/huaweicloud-sdk-go-v3/services/ces/v1/model"
+	"github.com/stretchr/testify/assert"
+)
+
+func TestListAllResources(t *testing.T) {
+	exporter := GetMonitoringCollector([]string{"SYS.ECS"})
+	lables, metrics := exporter.listAllResources("TEST.ECS")
+	assert.Equal(t, 0, len(lables))
+	assert.Equal(t, 0, len(metrics))
+
+	ecsInfo := ECSInfo{}
+	serviceMap["SYS.ECS"] = ecsInfo
+	lables = map[string]labelInfo{
+		"0001-0001-000000001": {
+			Name:  []string{"name"},
+			Value: []string{"host01"},
+		},
+	}
+	metrics = []model.MetricInfoList{
+		{
+			Dimensions: []model.MetricsDimension{
+				{Name: "instance_id", Value: "0001-0001-000000001"},
+			},
+			MetricName: "cpu_utils",
+			Namespace:  "SYS.ECS",
+		},
+	}
+	patches := gomonkey.ApplyMethodReturn(ecsInfo, "GetResourceInfo", lables, metrics)
+	l, m := exporter.listAllResources("SYS.ECS")
+	assert.Equal(t, 1, len(l))
+	assert.Equal(t, 1, len(m))
+	patches.Reset()
+}
diff --git a/collector/functiongraph_test.go b/collector/functiongraph_test.go
new file mode 100644
index 00000000..50f258ca
--- /dev/null
+++ b/collector/functiongraph_test.go
@@ -0,0 +1,20 @@
+package collector
+
+import (
+	"testing"
+
+	"github.com/agiledragon/gomonkey/v2"
+	"github.com/stretchr/testify/assert"
+)
+
+func TestFunctionGraphGetResourceInfo(t *testing.T) {
+	sysConfig := map[string][]string{"package-functionname": {"count"}}
+	patches := gomonkey.ApplyFuncReturn(getMetricConfigMap, sysConfig)
+	patches.ApplyFuncReturn(listResources, mockRmsResource(), nil)
+	defer patches.Reset()
+
+	var fsgetter FunctionGraphInfo
+	labels, metrics := fsgetter.GetResourceInfo()
+	assert.Equal(t, 1, len(labels))
+	assert.Equal(t, 1, len(metrics))
+}
diff --git a/collector/gaussdb_test.go b/collector/gaussdb_test.go
new file mode 100644
index 00000000..52670cdf
--- /dev/null
+++ b/collector/gaussdb_test.go
@@ -0,0 +1,28 @@
+package collector
+
+import (
+	"testing"
+
+	"github.com/agiledragon/gomonkey/v2"
+	"github.com/huaweicloud/huaweicloud-sdk-go-v3/services/ces/v1/model"
+	"github.com/stretchr/testify/assert"
+)
+
+func TestGaussdbGetResourceInfo(t *testing.T) {
+	sysConfig := map[string][]string{"gaussdb_mysql_instance_id,gaussdb_mysql_node_id": {"gaussdb_mysql114_innodb_bufpool_read_ahead"}}
+	patches := gomonkey.ApplyFuncReturn(getMetricConfigMap, sysConfig)
+	nodes := mockRmsResource()
+	nodes[0].Properties = map[string]interface{}{
+		"dimensions": []model.MetricsDimension{
+			{Name: "gaussdb_mysql_instance_id", Value: "0001-0001-0000001"},
+			{Name: "gaussdb_mysql_node_id", Value: "node-0001-0001-0000001"},
+		},
+	}
+	patches.ApplyFuncReturn(listResources, mockRmsResource(), nil)
+	defer patches.Reset()
+
+	var gaussdbgetter GAUSSDBInfo
+	labels, metrics := gaussdbgetter.GetResourceInfo()
+	assert.Equal(t, 1, len(labels))
+	assert.Equal(t, 1, len(metrics))
+}
diff --git a/collector/ges_test.go b/collector/ges_test.go
new file mode 100644
index 00000000..f9efcd3e
--- /dev/null
+++ b/collector/ges_test.go
@@ -0,0 +1,20 @@
+package collector
+
+import (
+	"testing"
+
+	"github.com/agiledragon/gomonkey/v2"
+	"github.com/stretchr/testify/assert"
+)
+
+func TestGesGetResourceInfo(t *testing.T) {
+	sysConfig := map[string][]string{"instance_id": {"ges001_vertex_util"}}
+	patches := gomonkey.ApplyFuncReturn(getMetricConfigMap, sysConfig)
+	patches.ApplyFuncReturn(listResources, mockRmsResource(), nil)
+	defer patches.Reset()
+
+	var gesgetter GESInfo
+	labels, metrics := gesgetter.GetResourceInfo()
+	assert.Equal(t, 1, len(labels))
+	assert.Equal(t, 1, len(metrics))
+}
diff --git a/collector/nat_test.go b/collector/nat_test.go
new file mode 100644
index 00000000..59cc2af6
--- /dev/null
+++ b/collector/nat_test.go
@@ -0,0 +1,20 @@
+package collector
+
+import (
+	"testing"
+
+	"github.com/agiledragon/gomonkey/v2"
+	"github.com/stretchr/testify/assert"
+)
+
+func TestNatGetResourceInfo(t *testing.T) {
+	sysConfig := map[string][]string{"nat_gateway_id": {"snat_connection"}}
+	patches := gomonkey.ApplyFuncReturn(getMetricConfigMap, sysConfig)
+	patches.ApplyFuncReturn(listResources, mockRmsResource(), nil)
+	defer patches.Reset()
+
+	var netgetter NATInfo
+	labels, metrics := netgetter.GetResourceInfo()
+	assert.Equal(t, 1, len(labels))
+	assert.Equal(t, 1, len(metrics))
+}
diff --git a/collector/rds.go b/collector/rds.go
index 0f10cb6e..4a1953dd 100644
--- a/collector/rds.go
+++ b/collector/rds.go
@@ -18,6 +18,8 @@ type RdsInstanceProperties struct {
 	Port          string `json:"port"`
 	DataVip       string `json:"dataVip"`
 	EngineName    string `json:"engineName"`
+	CPU           string `json:"cpu"`
+	MEM           string `json:"mem"`
 }
 
 var rdsInfo serversInfo
@@ -47,8 +49,10 @@ func (getter RDSInfo) GetResourceInfo() (map[string]labelInfo, []model.MetricInf
 					metrics := buildSingleDimensionMetrics(metricNames, "SYS.RDS", dimName, instance.ID)
 					filterMetrics = append(filterMetrics, metrics...)
 					info := labelInfo{
-						Name:  []string{"name", "epId", "engineVersion", "nodeNum", "port", "dataVip", "engineName"},
-						Value: []string{instance.Name, instance.EpId, instance.EngineVersion, instance.NodeNum, instance.Port, instance.DataVip, instance.EngineName},
+						Name: []string{"name", "epId", "engineVersion", "nodeNum", "port", "dataVip", "engineName",
+							"cpu", "mem"},
+						Value: []string{instance.Name, instance.EpId, instance.EngineVersion, instance.NodeNum,
+							instance.Port, instance.DataVip, instance.EngineName, instance.CPU, instance.MEM},
 					}
 					keys, values := getTags(instance.Tags)
 					info.Name = append(info.Name, keys...)
diff --git a/collector/rds_test.go b/collector/rds_test.go
new file mode 100644
index 00000000..eb05881c
--- /dev/null
+++ b/collector/rds_test.go
@@ -0,0 +1,26 @@
+package collector
+
+import (
+	"testing"
+
+	"github.com/agiledragon/gomonkey/v2"
+	"github.com/stretchr/testify/assert"
+)
+
+func TestRdsGetResourceInfo(t *testing.T) {
+	sysConfig := map[string][]string{"rds_cluster_id": {"rds001_cpu_util"}}
+	patches := gomonkey.ApplyFuncReturn(getMetricConfigMap, sysConfig)
+	volumes := mockRmsResource()
+	volumes[0].Properties = map[string]interface{}{
+		"cpu":        "2",
+		"mem":        "16",
+		"engineName": "mysql",
+	}
+	patches.ApplyFuncReturn(listResources, volumes, nil)
+	defer patches.Reset()
+
+	var rdsInfo RDSInfo
+	labels, metrics := rdsInfo.GetResourceInfo()
+	assert.Equal(t, 1, len(labels))
+	assert.Equal(t, 1, len(metrics))
+}
diff --git a/collector/rms.go b/collector/rms.go
index 78708a84..7eabad85 100644
--- a/collector/rms.go
+++ b/collector/rms.go
@@ -12,11 +12,11 @@ func getRMSClient() *v1.RmsClient {
 		WithCredential(global.NewCredentialsBuilder().WithAk(conf.AccessKey).WithSk(conf.SecretKey).Build()).Build())
 }
 
-func listResources(provider, rourceType string) ([]model.ResourceEntity, error) {
+func listResources(provider, resourceType string) ([]model.ResourceEntity, error) {
 	limit := int32(200)
 	req := &model.ListResourcesRequest{
 		Provider: provider,
-		Type:     rourceType,
+		Type:     resourceType,
 		RegionId: &conf.Region,
 		Limit:    &limit,
 	}
diff --git a/collector/utils_test.go b/collector/utils_test.go
new file mode 100644
index 00000000..9b99df3b
--- /dev/null
+++ b/collector/utils_test.go
@@ -0,0 +1,262 @@
+package collector
+
+import (
+	"testing"
+
+	"github.com/agiledragon/gomonkey/v2"
+	cbrmodel "github.com/huaweicloud/huaweicloud-sdk-go-v3/services/cbr/v1/model"
+	"github.com/huaweicloud/huaweicloud-sdk-go-v3/services/ces/v1/model"
+	"github.com/stretchr/testify/assert"
+)
+
+func TestGetResourceKeyFromMetricInfo(t *testing.T) {
+	metric := model.MetricInfoList{
+		Dimensions: []model.MetricsDimension{
+			{Name: "instance_id", Value: "0001-0001-000001"},
+			{Name: "disk", Value: "vda"},
+		},
+	}
+	assert.Equal(t, "vda.0001-0001-000001", GetResourceKeyFromMetricInfo(metric))
+}
+
+func TestGetResourceKeyFromMetricData(t *testing.T) {
+	dmsNs := "SYS.DMS"
+	agtNs := "AGT.ECS"
+	mrsNs := "SYS.MRS"
+	dcssNs := "SYS.DCS"
+	testCases := []struct {
+		name     string
+		metric   model.BatchMetricData
+		expected string
+	}{
+		{
+			name: "dms-instance",
+			metric: model.BatchMetricData{
+				Namespace: &dmsNs,
+				Dimensions: &[]model.MetricsDimension{
+					{"kafka_instance_id", "kafka-0001-0001"},
+				},
+			},
+			expected: "kafka-0001-0001",
+		},
+		{
+			name: "dms-instance-broker",
+			metric: model.BatchMetricData{
+				Namespace: &dmsNs,
+				Dimensions: &[]model.MetricsDimension{
+					{"kafka_instance_id", "kafka-0001-0001"},
+					{"kafka_broker", "0"},
+				},
+			},
+			expected: "kafka-0001-0001",
+		},
+		{
+			name: "dms-invalid",
+			metric: model.BatchMetricData{
+				Namespace: &dmsNs,
+				Dimensions: &[]model.MetricsDimension{
+					{"xxxxx_id", "kafka-0001-0001"},
+					{"kafka_broker", "0"},
+				},
+			},
+			expected: "",
+		},
+		{
+			name: "agt-instance",
+			metric: model.BatchMetricData{
+				Namespace: &agtNs,
+				Dimensions: &[]model.MetricsDimension{
+					{"instance_id", "0001-0001-000001"},
+				},
+			},
+			expected: "0001-0001-000001",
+		},
+		{
+			name: "agt-instance-disk",
+			metric: model.BatchMetricData{
+				Namespace: &agtNs,
+				Dimensions: &[]model.MetricsDimension{
+					{"instance_id", "0001-0001-000001"},
+					{"disk", "vda"},
+				},
+			},
+			expected: "0001-0001-000001",
+		},
+		{
+			name: "agt-invalid",
+			metric: model.BatchMetricData{
+				Namespace: &agtNs,
+				Dimensions: &[]model.MetricsDimension{
+					{"xxxx_id", "0001-0001-000001"},
+					{"disk", "vda"},
+				},
+			},
+			expected: "",
+		},
+		{
+			name: "mrs-cluster",
+			metric: model.BatchMetricData{
+				Namespace: &mrsNs,
+				Dimensions: &[]model.MetricsDimension{
+					{"cluster_id", "0001-0001-000001"},
+				},
+			},
+			expected: "0001-0001-000001",
+		},
+		{
+			name: "mrs-cluster-service_name",
+			metric: model.BatchMetricData{
+				Namespace: &mrsNs,
+				Dimensions: &[]model.MetricsDimension{
+					{"cluster_id", "0001-0001-000001"},
+					{"service_name", "YARN"},
+				},
+			},
+			expected: "0001-0001-000001",
+		},
+		{
+			name: "mrs-invalid",
+			metric: model.BatchMetricData{
+				Namespace: &mrsNs,
+				Dimensions: &[]model.MetricsDimension{
+					{"xxxx_id", "0001-0001-000001"},
+					{"service_name", "YARN"},
+				},
+			},
+			expected: "",
+		},
+		{
+			name: "dcs-instance",
+			metric: model.BatchMetricData{
+				Namespace: &dcssNs,
+				Dimensions: &[]model.MetricsDimension{
+					{"dcs_instance_id", "0001-0001-000001"},
+				},
+			},
+			expected: "0001-0001-000001",
+		},
+		{
+			name: "dcs-instance-node",
+			metric: model.BatchMetricData{
+				Namespace: &dcssNs,
+				Dimensions: &[]model.MetricsDimension{
+					{"dcs_instance_id", "0001-0001-000001"},
+					{"dcs_cluster_redis_node", "node-00001-0000001"},
+				},
+			},
+			expected: "node-00001-0000001.0001-0001-000001",
+		},
+	}
+	for _, testCase := range testCases {
+		t.Run(testCase.name, func(t *testing.T) {
+			assert.Equal(t, testCase.expected, GetResourceKeyFromMetricData(testCase.metric))
+		})
+	}
+}
+
+func TestGetEndpoint(t *testing.T) {
+	host = "iam.cn-test-9.myhuaweicloud.com"
+	assert.Equal(t, "https://ecs.cn-test-9.myhuaweicloud.com/v2", getEndpoint("ecs", "v2"))
+}
+
+func TestGetTags(t *testing.T) {
+	tags := map[string]string{
+		"key_a": "value_a",
+	}
+	keys, values := getTags(tags)
+	assert.Equal(t, "key_a", keys[0])
+	assert.Equal(t, "value_a", values[0])
+
+	tags = map[string]string{
+		"1111": "11111",
+	}
+	keys, values = getTags(tags)
+	assert.Equal(t, 0, len(keys))
+	assert.Equal(t, 0, len(values))
+}
+
+func TestFmtTags(t *testing.T) {
+	tag1 := []byte("test-error")
+	tags := fmtTags(tag1)
+	assert.Equal(t, 0, len(tags))
+
+	valueA := "value_a"
+	tagInfo := []cbrmodel.Tag{
+		{Key: "key_a", Value: &valueA},
+	}
+	tags = fmtTags(tagInfo)
+	assert.Equal(t, "value_a", tags["key_a"])
+}
+
+func TestGetDimsNameKey(t *testing.T) {
+	dims := []model.MetricsDimension{
+		{Name: "instance_id", Value: "0001-001-0000001"},
+		{Name: "disk", Value: "vda"},
+	}
+	assert.Equal(t, "instance_id,disk", getDimsNameKey(dims))
+}
+
+func TestGetDimsValueKey(t *testing.T) {
+	dims := []model.MetricsDimension{
+		{Name: "instance_id", Value: "0001-001-0000001"},
+		{Name: "disk", Value: "vda"},
+	}
+	assert.Equal(t, "0001-001-0000001,vda", getDimsValueKey(dims))
+}
+
+func TestBuildSingleDimensionMetrics(t *testing.T) {
+	metricNames := []string{"cpu_util", "mem_util", "disk_util_inband"}
+	metrics := buildSingleDimensionMetrics(metricNames, "SYS.ECS", "instance_id", "0001-0001-0000001")
+	assert.Equal(t, len(metricNames), len(metrics))
+}
+
+func TestBuildDimensionMetrics(t *testing.T) {
+	metricNames := []string{"cpu_util", "mem_util", "disk_util_inband"}
+	dims := []model.MetricsDimension{
+		{Name: "instance_id", Value: "0001-0001-0000001"},
+		{Name: "disk", Value: "vda"},
+	}
+	metrics := buildDimensionMetrics(metricNames, "SYS.ECS", dims)
+	assert.Equal(t, len(metricNames), len(metrics))
+}
+
+func TestGetDefaultString(t *testing.T) {
+	assert.Equal(t, "", getDefaultString(nil))
+	value := "test"
+	assert.Equal(t, "test", getDefaultString(&value))
+}
+
+func TestFmtResourceProperties(t *testing.T) {
+	propertiesmap := map[string]interface{}{
+		"id": "000000001",
+	}
+
+	var properties struct {
+		ID string `json:"id"`
+	}
+	err := fmtResourceProperties(propertiesmap, &properties)
+	assert.Equal(t, true, err == nil)
+	assert.Equal(t, "000000001", properties.ID)
+}
+
+func TestGetResourcesBaseInfoFromRMS(t *testing.T) {
+	patches := gomonkey.ApplyFuncReturn(listResources, mockRmsResource(), nil)
+	resource, err := getResourcesBaseInfoFromRMS("ecs", "cloudserver")
+	assert.Equal(t, true, err == nil)
+	assert.Equal(t, 1, len(resource))
+	patches.Reset()
+}
+
+func TestGenDefaultReqDefWithOffsetAndLimit(t *testing.T) {
+	type Response struct {
+		HttpStatusCode int `json:"-"`
+	}
+	path := "/v1.0/{project_id}/streaming/jobs"
+	requestDef := genDefaultReqDefWithOffsetAndLimit(path, new(Response))
+	assert.Equal(t, path, requestDef.Path)
+}
+
+func TestGetHcClient(t *testing.T) {
+	client := getHcClient("ces.test.huawei.com")
+	assert.Equal(t, true, client != nil)
+}
diff --git a/collector/waf_test.go b/collector/waf_test.go
new file mode 100644
index 00000000..acc4ac4c
--- /dev/null
+++ b/collector/waf_test.go
@@ -0,0 +1,20 @@
+package collector
+
+import (
+	"testing"
+
+	"github.com/agiledragon/gomonkey/v2"
+	"github.com/stretchr/testify/assert"
+)
+
+func TestWafGetResourceInfo(t *testing.T) {
+	sysConfig := map[string][]string{"waf_instance_id": {"attacks"}}
+	patches := gomonkey.ApplyFuncReturn(getMetricConfigMap, sysConfig)
+	patches.ApplyFuncReturn(listResources, mockRmsResource(), nil)
+	defer patches.Reset()
+
+	var wafgetter WAFInfo
+	labels, metrics := wafgetter.GetResourceInfo()
+	assert.Equal(t, 1, len(labels))
+	assert.Equal(t, 1, len(metrics))
+}
diff --git a/go.mod b/go.mod
index bea1a9ee..d3b173ed 100644
--- a/go.mod
+++ b/go.mod
@@ -1,16 +1,41 @@
 module github.com/huaweicloud/cloudeye-exporter
 
-go 1.16
+go 1.19
 
 require (
+	github.com/agiledragon/gomonkey/v2 v2.10.1
 	github.com/huaweicloud/huaweicloud-sdk-go-v3 v0.1.35
 	github.com/prometheus/client_golang v1.12.2
+	github.com/stretchr/testify v1.8.3
 	go.uber.org/zap v1.24.0
 	gopkg.in/natefinch/lumberjack.v2 v2.2.1
 	gopkg.in/yaml.v3 v3.0.1
 )
 
+require (
+	github.com/beorn7/perks v1.0.1 // indirect
+	github.com/cespare/xxhash/v2 v2.1.2 // indirect
+	github.com/davecgh/go-spew v1.1.1 // indirect
+	github.com/golang/protobuf v1.5.2 // indirect
+	github.com/json-iterator/go v1.1.12 // indirect
+	github.com/matttproud/golang_protobuf_extensions v1.0.1 // indirect
+	github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
+	github.com/modern-go/reflect2 v1.0.2 // indirect
+	github.com/pmezard/go-difflib v1.0.0 // indirect
+	github.com/prometheus/client_model v0.2.0 // indirect
+	github.com/prometheus/common v0.32.1 // indirect
+	github.com/prometheus/procfs v0.7.3 // indirect
+	go.mongodb.org/mongo-driver v1.11.2 // indirect
+	go.uber.org/atomic v1.7.0 // indirect
+	go.uber.org/multierr v1.6.0 // indirect
+	golang.org/x/crypto v0.7.0 // indirect
+	golang.org/x/sys v0.8.0 // indirect
+	google.golang.org/protobuf v1.26.0 // indirect
+	gopkg.in/ini.v1 v1.66.6 // indirect
+)
+
 replace (
 	github.com/gogo/protobuf => github.com/gogo/protobuf v1.3.2
 	golang.org/x/crypto => golang.org/x/crypto v0.0.0-20220525230936-793ad666bf5e
+	golang.org/x/net => golang.org/x/net v0.10.0
 )
diff --git a/go.sum b/go.sum
index 6485fe92..989caa1e 100644
--- a/go.sum
+++ b/go.sum
@@ -33,13 +33,14 @@ cloud.google.com/go/storage v1.10.0/go.mod h1:FLPqc6j+Ki4BU591ie1oL6qBQGu2Bl/tZ9
 dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU=
 github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
 github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo=
+github.com/agiledragon/gomonkey/v2 v2.10.1 h1:FPJJNykD1957cZlGhr9X0zjr291/lbazoZ/dmc4mS4c=
+github.com/agiledragon/gomonkey/v2 v2.10.1/go.mod h1:ap1AmDzcVOAz1YpeJ3TCzIgstoaWLA6jbbgxfB4w2iY=
 github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc=
 github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc=
 github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0=
 github.com/alecthomas/units v0.0.0-20190717042225-c3de453c63f4/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0=
 github.com/alecthomas/units v0.0.0-20190924025748-f65c72e2690d/go.mod h1:rBZYJk541a8SKzHPHnH3zbiI+7dagKZ0cgpgrD7Fyho=
 github.com/benbjohnson/clock v1.1.0 h1:Q92kusRqC1XV2MjkWETPvjJVqKetz1OzxZB7mHJLju8=
-github.com/benbjohnson/clock v1.1.0/go.mod h1:J11/hYXuz8f4ySSvYwY0FKfm+ezbsZBKZxNJlLklBHA=
 github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q=
 github.com/beorn7/perks v1.0.0/go.mod h1:KWe93zE9D1o94FZ5RNwFwVgaQK1VOXiVxmqh+CedLV8=
 github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM=
@@ -126,6 +127,7 @@ github.com/google/pprof v0.0.0-20200708004538-1a94d8640e99/go.mod h1:ZgVRPoUq/hf
 github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI=
 github.com/googleapis/gax-go/v2 v2.0.4/go.mod h1:0Wqv26UfaUD9n4G6kQubkQ+KchISgw+vpHVxEJEs9eg=
 github.com/googleapis/gax-go/v2 v2.0.5/go.mod h1:DWXyrwAJ9X0FpwwEdw+IPEYBICEFu5mhpdKc/us6bOk=
+github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY=
 github.com/hashicorp/golang-lru v0.5.0/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8=
 github.com/hashicorp/golang-lru v0.5.1/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8=
 github.com/huaweicloud/huaweicloud-sdk-go-v3 v0.1.35 h1:nn19IWDk/maQhHI/1t+1wgpQB4h6DS43md/BIarnEIE=
@@ -139,6 +141,7 @@ github.com/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnr
 github.com/json-iterator/go v1.1.12/go.mod h1:e30LSqwooZae/UwlEbR2852Gd8hjQvJoHmT4TnhNGBo=
 github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod h1:6v2b51hI/fHJwM22ozAgKL4VKDeJcHhJFhtBdhmNjmU=
 github.com/jstemmer/go-junit-report v0.9.1/go.mod h1:Brl9GWCQeLvo8nXZwPNNblvFj/XSXhF0NWZEnDohbsk=
+github.com/jtolds/gls v4.20.0+incompatible/go.mod h1:QJZ7F/aHp+rZTRtaJ1ow/lLfFfVYBRgL+9YlvaHOwJU=
 github.com/julienschmidt/httprouter v1.2.0/go.mod h1:SYymIcj16QtmaHHD7aYtjjsJG7VTCxuUUipMqKk8s4w=
 github.com/julienschmidt/httprouter v1.3.0/go.mod h1:JR6WtHb+2LUe8TCKY3cZOxFyyO8IZAc4RVcycCCAKdM=
 github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8=
@@ -196,18 +199,17 @@ github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFR
 github.com/sirupsen/logrus v1.2.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo=
 github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE=
 github.com/sirupsen/logrus v1.6.0/go.mod h1:7uNnSEd1DgxDLC74fIahvMZmmYsHGZGEOFrfsX/uA88=
+github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d/go.mod h1:OnSkiWE9lh6wB0YB77sQom3nweQdgAjqCqsofrRNTgc=
+github.com/smartystreets/goconvey v1.6.4/go.mod h1:syvi0/a8iFYH4r/RixwvyeAJjdLS9QV7WQ/tjFTllLA=
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
 github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
-github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw=
 github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
 github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
 github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4=
 github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
-github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
-github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
 github.com/stretchr/testify v1.7.2/go.mod h1:R6va5+xMeoiuVRoj+gSkQ7d3FALtqAAGI1FQKckRals=
-github.com/stretchr/testify v1.8.0 h1:pSgiaMZlXftHpm5L7V1+rVB+AZJydKsMxsQBIJw4PKk=
-github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU=
+github.com/stretchr/testify v1.8.3 h1:RP3t2pwF7cMEbC1dqtB6poj3niw/9gnV4Cjg5oW5gtY=
+github.com/stretchr/testify v1.8.3/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo=
 github.com/tidwall/pretty v1.0.0 h1:HsD+QiTn7sK6flMKIvNmpqz1qrpP3Ps6jOKIKMooyg4=
 github.com/tidwall/pretty v1.0.0/go.mod h1:XNkn88O1ChpSDQmQeStsy+sBenx6DDtFZJxhVysOjyk=
 github.com/xdg-go/pbkdf2 v1.0.0/go.mod h1:jrpuAogTd400dnrH08LKmI/xc1MbPOebTwRqcT5RDeI=
@@ -218,7 +220,7 @@ github.com/yuin/goldmark v1.1.25/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9de
 github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
 github.com/yuin/goldmark v1.1.32/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
 github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
-github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k=
+github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY=
 go.mongodb.org/mongo-driver v1.11.2 h1:+1v2rDQUWNcGW7/7E0Jvdz51V38XXxJfhzbV17aNHCw=
 go.mongodb.org/mongo-driver v1.11.2/go.mod h1:s7p5vEtfbeR1gYi6pnj3c3/urpbLv2T5Sfd6Rp2HBB8=
 go.opencensus.io v0.21.0/go.mod h1:mSImk1erAIZhrmZN+AvHh14ztQfjbGwt4TtuofqLduU=
@@ -229,7 +231,6 @@ go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
 go.uber.org/atomic v1.7.0 h1:ADUqmZGgLDDfbSL9ZmPxKTybcoEYHgpYfELNoN+7hsw=
 go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc=
 go.uber.org/goleak v1.1.11 h1:wy28qYRKZgnJTxGxvye5/wgWr1EKjmUDGYox5mGlRlI=
-go.uber.org/goleak v1.1.11/go.mod h1:cwTWslyiVhfpKIDGSZEM2HlOvcqm+tG4zioyIeLoqMQ=
 go.uber.org/multierr v1.6.0 h1:y6IPFStTAIT5Ytl7/XYmHvzXQ7S3g/IeZW9hyZ5thw4=
 go.uber.org/multierr v1.6.0/go.mod h1:cdWPpRnG4AhwMwsgIHip0KRBQjJy5kYEpYjJxpXp9iU=
 go.uber.org/zap v1.24.0 h1:FiJd5l1UOLj0wCgbSE0rwwXHzEdAZS6hiiSnxJN/D60=
@@ -266,38 +267,9 @@ golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod h1:QqPTAvyqsEbceGzB
 golang.org/x/mod v0.1.1-0.20191107180719-034126e5016b/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg=
 golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
 golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
-golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
-golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
-golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
-golang.org/x/net v0.0.0-20181114220301-adae6a3d119a/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
-golang.org/x/net v0.0.0-20190108225652-1e06a53dbb7e/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
-golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
-golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
-golang.org/x/net v0.0.0-20190501004415-9ce7a6920f09/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
-golang.org/x/net v0.0.0-20190503192946-f4e77d36d62c/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
-golang.org/x/net v0.0.0-20190603091049-60506f45cf65/go.mod h1:HSz+uSET+XFnRR8LxR5pz3Of3rY3CfYBVs4xY44aLks=
-golang.org/x/net v0.0.0-20190613194153-d28f0bde5980/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
-golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
-golang.org/x/net v0.0.0-20190628185345-da137c7871d7/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
-golang.org/x/net v0.0.0-20190724013045-ca1201d0de80/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
-golang.org/x/net v0.0.0-20191209160850-c0dbc17a3553/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
-golang.org/x/net v0.0.0-20200114155413-6afb5195e5aa/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
-golang.org/x/net v0.0.0-20200202094626-16171245cfb2/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
-golang.org/x/net v0.0.0-20200222125558-5a598a2470a0/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
-golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
-golang.org/x/net v0.0.0-20200301022130-244492dfa37a/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
-golang.org/x/net v0.0.0-20200324143707-d3edc9973b7e/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A=
-golang.org/x/net v0.0.0-20200501053045-e0ff5e5a1de5/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A=
-golang.org/x/net v0.0.0-20200506145744-7e3656a0809f/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A=
-golang.org/x/net v0.0.0-20200513185701-a91f0712d120/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A=
-golang.org/x/net v0.0.0-20200520182314-0ba52f642ac2/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A=
-golang.org/x/net v0.0.0-20200625001655-4c5254603344/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA=
-golang.org/x/net v0.0.0-20200707034311-ab3426394381/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA=
-golang.org/x/net v0.0.0-20200822124328-c89045814202/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA=
-golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
-golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4/go.mod h1:p54w0d4576C0XHj96bSt6lcn1PtDYWL6XObtHCRCNQM=
-golang.org/x/net v0.0.0-20210525063256-abc453219eb5/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
-golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
+golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4=
+golang.org/x/mod v0.8.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
+golang.org/x/net v0.10.0/go.mod h1:0qNGK6F8kojg2nk9dLZ2mShWaEBan6FAoqfSigmmuDg=
 golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
 golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
 golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
@@ -315,6 +287,8 @@ golang.org/x/sync v0.0.0-20200625203802-6e8e738ad208/go.mod h1:RxMgew5VJxzue5/jJ
 golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20201207232520-09787c993a3a/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sync v0.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20181116152217-5ac8a444bdc5/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
@@ -337,7 +311,6 @@ golang.org/x/sys v0.0.0-20200202164722-d101bd2416d5/go.mod h1:h1NjWce9XRLGQEsW7w
 golang.org/x/sys v0.0.0-20200212091648-12a6c2dcc1e4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200302150141-5c8b2ff67527/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200331124033-c3d80250170d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200501052902-10377860bb8e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200511232937-7e40ca221e25/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
@@ -346,17 +319,17 @@ golang.org/x/sys v0.0.0-20200523222454-059865788121/go.mod h1:h1NjWce9XRLGQEsW7w
 golang.org/x/sys v0.0.0-20200615200032-f1bc736245b1/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200625212154-ddb9806d33ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200803210538-64077c9b5642/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20210124154548-22da62e12c0c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20210330210617-4fbd30eecc44/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20210510120138-977fb7262007/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20210603081109-ebe580a85c40/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20220114195835-da31bd327af9 h1:XfKQ4OlFl8okEOr5UvAqFRVj8pY/4yfcXrddB8qAbU0=
 golang.org/x/sys v0.0.0-20220114195835-da31bd327af9/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.8.0 h1:EBmGv8NaZBZTWvrbjNoL6HVt+IVy3QDQpJs7VRIw3tU=
+golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
+golang.org/x/term v0.8.0/go.mod h1:xPskH00ivmX89bAKVGSKKtLOWNx2+17Eiy94tnKShWo=
 golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
@@ -364,6 +337,7 @@ golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
 golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
 golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
 golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
+golang.org/x/text v0.9.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8=
 golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
 golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
 golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
@@ -373,6 +347,7 @@ golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3
 golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
 golang.org/x/tools v0.0.0-20190312151545-0bb0c0a6e846/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
 golang.org/x/tools v0.0.0-20190312170243-e65039ee4138/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
+golang.org/x/tools v0.0.0-20190328211700-ab21143f2384/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
 golang.org/x/tools v0.0.0-20190425150028-36563e24a262/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q=
 golang.org/x/tools v0.0.0-20190506145303-2d16b83fe98c/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q=
 golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q=
@@ -409,7 +384,8 @@ golang.org/x/tools v0.0.0-20200729194436-6467de6f59a7/go.mod h1:njjCfa9FT2d7l9Bc
 golang.org/x/tools v0.0.0-20200804011535-6c149bb5ef0d/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA=
 golang.org/x/tools v0.0.0-20200825202427-b303f430e36d/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA=
 golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
-golang.org/x/tools v0.1.5/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk=
+golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc=
+golang.org/x/tools v0.6.0/go.mod h1:Xwgl3UAJ/d3gWutnCtw505GrjyAbvKui8lOU390QaIU=
 golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
diff --git a/main.go b/main.go
index 31a4438e..30d22cad 100644
--- a/main.go
+++ b/main.go
@@ -16,6 +16,8 @@ import (
 
 var (
 	clientConfig = flag.String("config", "./clouds.yml", "Path to the cloud configuration file")
+	securityMod  = flag.Bool("s", false, "Get ak sk from command line")
+	ak, sk       string
 )
 
 func handler(w http.ResponseWriter, r *http.Request) {
@@ -48,9 +50,24 @@ func epHandler(w http.ResponseWriter, r *http.Request) {
 	}
 }
 
+func getAkSkFromCommandLine() {
+	if *securityMod {
+		collector.SecurityMod = *securityMod
+		fmt.Print("Please input ak&sk split with space: (eg: {example_ak example_sk})")
+		_, err := fmt.Scanln(&ak, &sk)
+		if err != nil {
+			logs.Logger.Error("Read ak sk error: ", err.Error())
+			return
+		}
+		collector.TmpAK = ak
+		collector.TmpSK = sk
+	}
+}
+
 func main() {
 	flag.Parse()
 	logs.InitLog()
+	getAkSkFromCommandLine()
 	err := collector.InitCloudConf(*clientConfig)
 	if err != nil {
 		logs.Logger.Error("Init Cloud Config From File error: ", err.Error())
diff --git a/metric.yml b/metric.yml
index 9a25a332..70abbf34 100644
--- a/metric.yml
+++ b/metric.yml
@@ -47,44 +47,41 @@ SYS.DCS:
   resource: "rms"
   dim_metric_name:
     dcs_instance_id:
-      - connections_usage
-      - cpu_usage
+      - instantaneous_ops
       - memory_usage
-      - net_in_throughput
-      - net_out_throughput
       - connected_clients
-      - client_longest_out_list
-      - client_biggest_in_buf
-      - blocked_clients
-      - used_memory
-      - used_memory_rss
-      - used_memory_peak
-      - used_memory_lua
-      - memory_frag_ratio
+      - cpu_usage
+      - keyspace_hits_perc
       - total_connections_received
-      - total_commands_processed
-      - instantaneous_ops
-      - total_net_input_bytes
-      - total_net_output_bytes
       - instantaneous_input_kbps
       - instantaneous_output_kbps
-      - rejected_connections
-      - sync_full
-      - sync_partial_ok
-      - sync_partial_err
+      - total_net_input_bytes
+      - total_net_output_bytes
+      - used_memory
+      - memory_frag_ratio
+      - keys
       - expired_keys
       - evicted_keys
+      - expires
+      - command_max_delay
+      - is_slow_log_exist
+      - used_memory_dataset
+      - used_memory_dataset_perc
+      - auth_errors
+      - blocked_clients
+      - client_longest_out_list
+      - client_biggest_in_buf
+      - rejected_connections
+      - total_commands_processed
+      - used_memory_rss
+      - used_memory_peak
+      - used_memory_lua
       - keyspace_hits
       - keyspace_misses
       - pubsub_channels
       - pubsub_patterns
-      - aof_current_size
-      - latest_fork_usec
-      - keyspace_hits_perc
-      - used_memory_dataset
-      - used_memory_dataset_perc
-      - keys
-      - expires
+      - net_in_throughput
+      - net_out_throughput
       - set
       - get
       - del
@@ -95,14 +92,18 @@ SYS.DCS:
       - hget
       - hmset
       - hmget
+      - scan
+      - setex
       - hdel
-      - auth_errors
-      - command_max_delay
-      - is_slow_log_exist
-      - slave_psyncing_opid_gap_max
-      - slave_state_abnormal_count
       - sadd
       - smembers
+      - slave_psyncing_opid_gap_max
+      - slave_state_abnormal_count
+      - sync_full
+      - sync_partial_ok
+      - sync_partial_err
+      - aof_current_size
+      - latest_fork_usec
       - rx_controlled
       - bandwidth_usage
       - disk_device_io_util_max
@@ -115,39 +116,41 @@ SYS.DCS:
       - node_status
       - command_max_rt
       - command_avg_rt
-      - cpu_avg_usage
-    'dcs_instance_id,dcs_cluster_redis_node':
       - connections_usage
-      - cpu_usage
+      - cpu_avg_usage
+      - setex
+      - scan
+      - storage_usage
+      - used_storage
+    dcs_instance_id,dcs_cluster_redis_node:
+      - instantaneous_ops
       - memory_usage
       - connected_clients
-      - client_longest_out_list
-      - client_biggest_in_buf
-      - blocked_clients
-      - used_memory
-      - used_memory_rss
-      - used_memory_peak
-      - used_memory_lua
-      - memory_frag_ratio
+      - cpu_usage
+      - keyspace_hits_perc
       - total_connections_received
-      - total_commands_processed
-      - instantaneous_ops
-      - total_net_input_bytes
-      - total_net_output_bytes
       - instantaneous_input_kbps
       - instantaneous_output_kbps
-      - rejected_connections
+      - total_net_input_bytes
+      - total_net_output_bytes
+      - used_memory
+      - memory_frag_ratio
+      - keys
       - expired_keys
       - evicted_keys
-      - pubsub_channels
-      - pubsub_patterns
-      - keyspace_hits_perc
       - command_max_delay
       - is_slow_log_exist
-      - keys
       - ms_repl_offset
-      - sadd
-      - smembers
+      - blocked_clients
+      - client_longest_out_list
+      - client_biggest_in_buf
+      - rejected_connections
+      - total_commands_processed
+      - used_memory_rss
+      - used_memory_peak
+      - used_memory_lua
+      - pubsub_channels
+      - pubsub_patterns
       - set
       - get
       - del
@@ -159,6 +162,8 @@ SYS.DCS:
       - hmset
       - hmget
       - hdel
+      - sadd
+      - smembers
       - rx_controlled
       - bandwidth_usage
       - node_status
@@ -171,10 +176,18 @@ SYS.DCS:
       - disk_device_write_requests_rate_avg
       - command_max_rt
       - command_avg_rt
+      - connections_usage
       - cpu_avg_usage
+      - scan
+      - used_storage
+      - storage_usage
       - sync_full
-    'dcs_instance_id,dcs_cluster_proxy2_node':
-      - connections_usage
+      - slow_log_counts
+      - disk_io_rt
+      - disk_io_timeout_cnt
+      - node_reboot
+      - setex
+    dcs_instance_id,dcs_cluster_proxy2_node:
       - node_status
       - cpu_usage
       - memory_usage
@@ -186,32 +199,40 @@ SYS.DCS:
       - total_net_output_bytes
       - command_max_rt
       - command_avg_rt
+      - connections_usage
       - cpu_avg_usage
+      - network_rt
+      - network_timeout_cnt
+      - node_reboot
+      - setex
+      - scan
     dcs_memcached_instance_id:
-      - cpu_usage
+      - mc_instantaneous_ops
       - memory_usage
-      - net_in_throughput
-      - net_out_throughput
       - mc_connected_clients
-      - mc_used_memory
-      - mc_used_memory_rss
-      - mc_used_memory_peak
-      - mc_memory_frag_ratio
+      - cpu_usage
+      - mc_keyspace_hits_perc
       - mc_connections_received
-      - mc_commands_processed
-      - mc_instantaneous_ops
-      - mc_net_input_bytes
-      - mc_net_output_bytes
       - mc_instantaneous_input_kbps
       - mc_instantaneous_output_kbps
-      - mc_rejected_connections
-      - mc_sync_full
-      - mc_sync_partial_ok
-      - mc_sync_partial_err
+      - mc_net_input_bytes
+      - mc_net_output_bytes
+      - mc_used_memory
+      - mc_memory_frag_ratio
+      - mc_curr_items
       - mc_expired_keys
       - mc_evicted_keys
-      - mc_aof_current_size
+      - mc_command_max_delay
+      - mc_is_slow_log_exist
+      - mc_auth_errors
+      - mc_auth_cmds
       - mc_cmd_get
+      - mc_used_memory_rss
+      - mc_used_memory_peak
+      - mc_aof_current_size
+      - mc_rejected_connections
+      - net_in_throughput
+      - net_out_throughput
       - mc_cmd_set
       - mc_cmd_flush
       - mc_cmd_touch
@@ -227,13 +248,6 @@ SYS.DCS:
       - mc_cas_misses
       - mc_cas_badval
       - mc_touch_hits
-      - mc_touch_misses
-      - mc_auth_cmds
-      - mc_auth_errors
-      - mc_curr_items
-      - mc_command_max_delay
-      - mc_keyspace_hits_perc
-      - mc_is_slow_log_exist
       - disk_device_io_util_max
       - disk_device_io_util_avg
       - disk_util_inband
@@ -242,6 +256,11 @@ SYS.DCS:
       - disk_device_write_requests_rate_max
       - disk_device_write_requests_rate_avg
       - sys_available_memory
+      - mc_commands_processed
+      - mc_sync_full
+      - mc_sync_partial_err
+      - mc_sync_partial_ok
+      - mc_touch_misses
 SYS.DCAAS:
   resource: "rms"
   dim_metric_name: