dc filter,

instances/dc_instances.go

@@ -41,6 +41,16 @@ func getDcInstancesIds(filters map[string]interface{}) (instanceIdsMap map[strin
 	request := dc.NewDescribeDirectConnectsRequest()
 
 	var apiCanFilters = map[string]bool{}
+
+	nameFilterMap := map[string]string{
+		"DirectConnectName": "direct-connect-name",
+		"DirectConnectId":   "direct-connect-id"}
+
+	for name, nameInFilter := range nameFilterMap {
+		dcTools.fillStringFilter(nameInFilter, filters[name], request)
+		apiCanFilters[name] = true
+	}
+
 	instanceIdsMap = make(map[string]map[string]interface{})
 	hasGet := make(map[string]bool)
 

instances/dc_tools.go

@@ -6,18 +6,31 @@ import (
 
 type dcToolStruct struct{}
 
-func (me *dcToolStruct) fillStringFilter(filterName string, valueInterface interface{}, request *dc.DescribeDirectConnectTunnelsRequest) (has bool) {
+func (me *dcToolStruct) fillStringFilter(filterName string, valueInterface interface{}, request interface{}) (has bool) {
+
 	if valueInterface == nil || request == nil {
 		return
 	}
+
+	dcxRequest, isDcx := request.(*dc.DescribeDirectConnectTunnelsRequest)
+
+	dcRequest, isDc := request.(*dc.DescribeDirectConnectsRequest)
+
 	str, ok := valueInterface.(string)
 	if !ok {
 		return
 	}
 	has = true
 	filter := &dc.Filter{}
 	filter.Name = &filterName
+
 	filter.Values = []*string{&str}
-	request.Filters = append(request.Filters, filter)
+	if isDcx {
+		dcxRequest.Filters = append(dcxRequest.Filters, filter)
+	}
+	if isDc {
+		dcRequest.Filters = append(dcRequest.Filters, filter)
+	}
+
 	return
 }

monitor/cvm_monitor.go

@@ -18,6 +18,8 @@ func cvmGetMonitorData(instanceIds []string,
 	delaySeconds int64,
 	instances map[string]map[string]interface{}) (allDataRet map[string]map[int64]float64, errRet error) {
 
+	_ = instances
+
 	return getMonitorDataByPrimarykey(cvmNamespaceInMonitor,
 		instanceIds,
 		PrimaryKeys[CvmProductName],

monitor/dc_monitor.go

@@ -24,6 +24,8 @@ func dcGetMonitorData(instanceIds []string,
 	delaySeconds int64,
 	instances map[string]map[string]interface{}) (allDataRet map[string]map[int64]float64, errRet error) {
 
+	_ = instances
+
 	return getMonitorDataByPrimarykey(dcNamespaceInMonitor,
 		instanceIds,
 		"directConnectId",
@@ -40,6 +42,8 @@ func dcxGetMonitorData(instanceIds []string,
 	delaySeconds int64,
 	instances map[string]map[string]interface{}) (allDataRet map[string]map[int64]float64, errRet error) {
 
+	_ = instances
+
 	return getMonitorDataByPrimarykey(dcxNamespaceInMonitor,
 		instanceIds,
 		"directConnectConnId",

monitor/mysql_monitor.go

@@ -18,6 +18,8 @@ func mysqlGetMonitorData(instanceIds []string,
 	delaySeconds int64,
 	instances map[string]map[string]interface{}) (allDataRet map[string]map[int64]float64, errRet error) {
 
+	_ = instances
+
 	return getMonitorDataByPrimarykey(mysqlNamespaceInMonitor,
 		instanceIds,
 		PrimaryKeys[MysqlProductName],

monitor/pub_clb_monitor.go

@@ -18,6 +18,8 @@ func clbGetMonitorData(instanceIds []string,
 	delaySeconds int64,
 	instances map[string]map[string]interface{}) (allDataRet map[string]map[int64]float64, errRet error) {
 
+	_ = instances
+
 	return getMonitorDataByPrimarykey(clbNamespaceInMonitor,
 		instanceIds,
 		"vip", //in redis they call LoadBalancerVip  "vip" in monitor.

monitor/redis_monitor.go

@@ -45,6 +45,8 @@ func nonClusterRedisGetMonitorData(instanceIds []string,
 	instances map[string]map[string]interface{}) (allDataRet map[string]map[int64]float64,
 	errRet error) {
 
+	_ = instances
+
 	noneClusterIds := make([]string, 0, len(instanceIds))
 	for id, data := range instances {
 		redisVersion := fmt.Sprintf("%v", data["Type"])
@@ -72,6 +74,8 @@ func clusterRedisGetMonitorData(instanceIds []string,
 	instances map[string]map[string]interface{}) (allDataRet map[string]map[int64]float64,
 	errRet error) {
 
+	_ = instances
+
 	clusterIds := make([]string, 0, len(instanceIds))
 	for id, data := range instances {
 		redisVersion := fmt.Sprintf("%v", data["Type"])