fix extra label/exclude instances bug

Author: shitoumomo

pkg/collector/handler.go

@@ -2,6 +2,7 @@ package collector
 
 import (
 	"fmt"
+	"github.com/tencentyun/tencentcloud-exporter/pkg/util"
 
 	"github.com/go-kit/kit/log"
 	"github.com/go-kit/kit/log/level"
@@ -107,6 +108,9 @@ func (h *baseProductHandler) GetSeriesByAll(m *metric.TcmMetric) ([]*metric.TcmS
 		return nil, err
 	}
 	for _, ins := range insList {
+		if len(m.Conf.ExcludeInstances) != 0 && util.IsStrInList(m.Conf.ExcludeInstances, ins.GetInstanceId()) {
+			continue
+		}
 		ql := map[string]string{
 			h.monitorQueryKey: ins.GetMonitorQueryKey(),
 		}

pkg/collector/handler_cmq.go

@@ -5,6 +5,7 @@ import (
 	"github.com/go-kit/kit/log"
 	"github.com/go-kit/kit/log/level"
 	"github.com/tencentyun/tencentcloud-exporter/pkg/metric"
+	"github.com/tencentyun/tencentcloud-exporter/pkg/util"
 )
 
 const (
@@ -75,6 +76,9 @@ func (h *cmqHandler) GetSeriesByAll(m *metric.TcmMetric) ([]*metric.TcmSeries, e
 		return nil, err
 	}
 	for _, ins := range insList {
+		if len(m.Conf.ExcludeInstances) != 0 && util.IsStrInList(m.Conf.ExcludeInstances, ins.GetInstanceId()) {
+			continue
+		}
 		queueName,err:=ins.GetFieldValueByName("QueueName")
 		if err!=nil{
 			level.Error(h.logger).Log("msg", "queue name not found")

pkg/collector/handler_mongo.go

@@ -131,7 +131,6 @@ func (h *mongoHandler) GetSeriesByCustom(m *metric.TcmMetric) ([]*metric.TcmSeri
 func (h *mongoHandler) getSeriesByMetricType(m *metric.TcmMetric, ins instance.TcInstance) (slist []*metric.TcmSeries, err error) {
 	if util.IsStrInList(MongoClusterMetrics, strings.ToLower(m.Meta.MetricName)) {
 		// 集群纬度
-		// cmgo-6ielucen
 		ql := map[string]string{
 			MongoInstanceidKey: ins.GetInstanceId(),
 		}

pkg/collector/handler_redis_mem.go

@@ -6,6 +6,7 @@ import (
 	"github.com/go-kit/kit/log/level"
 	"github.com/tencentyun/tencentcloud-exporter/pkg/instance"
 	"github.com/tencentyun/tencentcloud-exporter/pkg/metric"
+	"github.com/tencentyun/tencentcloud-exporter/pkg/util"
 	"strings"
 	"time"
 )
@@ -93,6 +94,9 @@ func (h *redisMemHandler) GetSeriesByAll(m *metric.TcmMetric) ([]*metric.TcmSeri
 		return nil, err
 	}
 	for _, ins := range insList {
+		if len(m.Conf.ExcludeInstances) != 0 && util.IsStrInList(m.Conf.ExcludeInstances, ins.GetInstanceId()) {
+			continue
+		}
 		sl, err := h.getSeriesByMetricType(m, ins)
 		if err != nil {
 			level.Error(h.logger).Log("msg", "Create metric series fail",

pkg/instance/instance.go

@@ -3,7 +3,6 @@ package instance
 import (
 	"fmt"
 	"reflect"
-	"strconv"
 )
 
 // 每个产品的实例对象, 可用于配置导出指标的额外label填充, 根据字段名获取值
@@ -39,12 +38,5 @@ func (ins *baseTcInstance) GetFieldValueByName(name string) (string, error) {
 	if v.Kind() == reflect.Ptr {
 		v = reflect.Indirect(v)
 	}
-	switch k := v.Kind(); k {
-	case reflect.Uint64:
-		return strconv.FormatUint(v.Uint(), 10), nil
-	case reflect.String:
-		return v.String(), nil
-	default:
-		return "", fmt.Errorf("value type not support, type=%s", k)
-	}
+	return fmt.Sprintf("%v", v.Interface()), nil
 }

pkg/instance/repository_cbs.go

@@ -2,7 +2,6 @@ package instance
 
 import (
 	"fmt"
-
 	"github.com/go-kit/kit/log"
 	"github.com/go-kit/kit/log/level"
 	sdk "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cbs/v20170312"
@@ -15,6 +14,7 @@ func init() {
 }
 
 type CbsTcInstanceRepository struct {
+	c      *config.TencentConfig
 	client *sdk.Client
 	logger log.Logger
 }
@@ -84,6 +84,7 @@ func NewCbsTcInstanceRepository(c *config.TencentConfig, logger log.Logger) (rep
 		return
 	}
 	repo = &CbsTcInstanceRepository{
+		c:      c,
 		client: cli,
 		logger: logger,
 	}