Merge pull request #103 from zianazhao/master

fix

go.mod

@@ -12,7 +12,7 @@ require (
 	github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cbs v1.0.334
 	github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cdb v1.0.413
 	github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cdn v1.0.437
-	github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cfs v1.0.634 // indirect
+	github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cfs v1.0.634
 	github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/ckafka v1.0.334
 	github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/clb v1.0.334
 	github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cmq v1.0.334
@@ -35,7 +35,7 @@ require (
 	github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/tdmq v1.0.413
 	github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/tse v1.0.430
 	github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/vpc v1.0.334
-	github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/waf v1.0.576 // indirect
+	github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/waf v1.0.576
 	github.com/tencentyun/cos-go-sdk-v5 v0.7.35
 	golang.org/x/time v0.0.0-20200630173020-3af7569d3a1e
 	gopkg.in/alecthomas/kingpin.v2 v2.2.6

pkg/collector/handler_cbs.go

@@ -214,7 +214,7 @@ func (h *cbsHandler) getInstanceSeries(m *metric.TcmMetric, ins instance.TcInsta
 }
 
 func NewCbsHandler(cred common.CredentialIface, c *TcProductCollector, logger log.Logger) (handler ProductHandler, err error) {
-	instanceInfosRepoCahe, err := instance.NewCbsTcInstanceInfosRepository(cred, c.Conf, logger)
+	instanceInfosRepoCache, err := instance.NewCbsTcInstanceInfosRepository(cred, c.Conf, logger)
 	if err != nil {
 		return nil, err
 	}
@@ -225,7 +225,7 @@ func NewCbsHandler(cred common.CredentialIface, c *TcProductCollector, logger lo
 			collector:       c,
 			logger:          logger,
 		},
-		instanceInfosRepo: instanceInfosRepoCahe,
+		instanceInfosRepo: instanceInfosRepoCache,
 	}
 	return
 

pkg/collector/handler_dts.go

@@ -13,7 +13,7 @@ import (
 
 const (
 	DTSNamespace     = "QCE/DTS"
-	DTSInstanceidKey = "SubscribeId"
+	DTSInstanceIdKey = "SubscribeId"
 )
 
 func init() {
@@ -85,23 +85,36 @@ func (h *dtsHandler) GetSeriesByOnly(m *metric.TcmMetric) ([]*metric.TcmSeries,
 }
 
 func (h *dtsHandler) GetSeriesByAll(m *metric.TcmMetric) ([]*metric.TcmSeries, error) {
-	var slist []*metric.TcmSeries
-	insList, err := h.collector.InstanceRepo.ListByFilters(m.Conf.InstanceFilters)
-	if err != nil {
-		return nil, err
+	var dimensions []string
+	for _, v := range m.Meta.SupportDimensions {
+		dimensions = append(dimensions, v)
 	}
-	for _, ins := range insList {
-		if len(m.Conf.ExcludeInstances) != 0 && util.IsStrInList(m.Conf.ExcludeInstances, ins.GetInstanceId()) {
-			continue
-		}
-		sl, err := h.getSeriesByMetricType(m, ins)
+	var slist []*metric.TcmSeries
+	if util.IsStrInList(dimensions, "replicationjobid") || util.IsStrInList(dimensions, "migratejobid") {
+		sl, err := h.getSeriesByMetricType(m, nil)
 		if err != nil {
-			level.Error(h.logger).Log("msg", "Create metric series fail",
-				"metric", m.Meta.MetricName, "instance", ins.GetInstanceId())
-			continue
+			level.Error(h.logger).Log("msg", "Create metric series fail", "metric", m.Meta.MetricName)
 		}
 		slist = append(slist, sl...)
+	} else {
+		insList, err := h.collector.InstanceRepo.ListByFilters(m.Conf.InstanceFilters)
+		if err != nil {
+			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",
+					"metric", m.Meta.MetricName, "instance", ins.GetInstanceId())
+				continue
+			}
+			slist = append(slist, sl...)
+		}
 	}
+
 	return slist, nil
 }
 
@@ -209,7 +222,7 @@ func NewDTSHandler(cred common.CredentialIface, c *TcProductCollector, logger lo
 		return nil, err
 	}
 	reloadInterval := time.Duration(c.ProductConf.ReloadIntervalMinutes * int64(time.Minute))
-	migrateInfosRepoCahe := instance.NewTcDtsInstanceMigrateInfosCache(migrateInfosRepo, reloadInterval, logger)
+	migrateInfosRepoCache := instance.NewTcDtsInstanceMigrateInfosCache(migrateInfosRepo, reloadInterval, logger)
 
 	replicationRepo, err := instance.NewDtsTcInstanceReplicationsRepository(cred, c.Conf, logger)
 	if err != nil {
@@ -219,11 +232,11 @@ func NewDTSHandler(cred common.CredentialIface, c *TcProductCollector, logger lo
 
 	handler = &dtsHandler{
 		baseProductHandler: baseProductHandler{
-			monitorQueryKey: DTSInstanceidKey,
+			monitorQueryKey: DTSInstanceIdKey,
 			collector:       c,
 			logger:          logger,
 		},
-		migrateInfosRepo: migrateInfosRepoCahe,
+		migrateInfosRepo: migrateInfosRepoCache,
 		replicationRepo:  replicationRepoCache,
 	}
 	return

pkg/collector/handler_nacos.go

@@ -200,21 +200,21 @@ func NewNacosHandler(cred common.CredentialIface, c *TcProductCollector, logger
 		return nil, err
 	}
 	reloadInterval := time.Duration(c.ProductConf.ReloadIntervalMinutes * int64(time.Minute))
-	podRepoCahe := instance.NewTcNacosInstancePodCache(podRepo, reloadInterval, logger)
+	podRepoCache := instance.NewTcNacosInstancePodCache(podRepo, reloadInterval, logger)
 
 	interfaceRepo, err := instance.NewNacosTcInstanceInterfaceRepository(cred, c.Conf, logger)
 	if err != nil {
 		return nil, err
 	}
-	interfaceRepoCahe := instance.NewTcNacosInstanceInterfaceCache(interfaceRepo, reloadInterval, logger)
+	interfaceRepoCache := instance.NewTcNacosInstanceInterfaceCache(interfaceRepo, reloadInterval, logger)
 	handler = &NacosHandler{
 		baseProductHandler: baseProductHandler{
 			monitorQueryKey: NacosInstanceidKey,
 			collector:       c,
 			logger:          logger,
 		},
-		podRepo:       podRepoCahe,
-		interfaceRepo: interfaceRepoCahe,
+		podRepo:       podRepoCache,
+		interfaceRepo: interfaceRepoCache,
 	}
 	return
 

pkg/collector/handler_redis_mem.go

@@ -216,15 +216,15 @@ func NewRedisMemHandler(cred common.CredentialIface, c *TcProductCollector, logg
 		return nil, err
 	}
 	reloadInterval := time.Duration(c.ProductConf.ReloadIntervalMinutes * int64(time.Minute))
-	nodeRepoCahe := instance.NewTcRedisInstanceNodeCache(nodeRepo, reloadInterval, logger)
+	nodeRepoCache := instance.NewTcRedisInstanceNodeCache(nodeRepo, reloadInterval, logger)
 
 	handler := &redisMemHandler{
 		baseProductHandler: baseProductHandler{
 			monitorQueryKey: RedisMemInstanceidKey,
 			collector:       c,
 			logger:          logger,
 		},
-		nodeRepo: nodeRepoCahe,
+		nodeRepo: nodeRepoCache,
 	}
 	return handler, nil
 }

pkg/collector/handler_tdmq.go

@@ -211,22 +211,22 @@ func NewTdmqHandler(cred common.CredentialIface, c *TcProductCollector, logger l
 		return nil, err
 	}
 	reloadInterval := time.Duration(c.ProductConf.ReloadIntervalMinutes * int64(time.Minute))
-	namespaceRepoCahe := instance.NewTcTdmqInstanceNamespaceCache(namespaceRepo, reloadInterval, logger)
+	namespaceRepoCache := instance.NewTcTdmqInstanceNamespaceCache(namespaceRepo, reloadInterval, logger)
 
 	topicRepo, err := instance.NewTdmqTcInstanceRocketMQTopicsRepository(cred, c.Conf, logger)
 	if err != nil {
 		return nil, err
 	}
-	topicRepoCahe := instance.NewTcTdmqInstanceTopicsCache(topicRepo, reloadInterval, logger)
+	topicRepoCache := instance.NewTcTdmqInstanceTopicsCache(topicRepo, reloadInterval, logger)
 
 	handler = &tdmqHandler{
 		baseProductHandler: baseProductHandler{
 			monitorQueryKey: TdmqInstanceidKey,
 			collector:       c,
 			logger:          logger,
 		},
-		namespaceRepo: namespaceRepoCahe,
-		topicRepo:     topicRepoCahe,
+		namespaceRepo: namespaceRepoCache,
+		topicRepo:     topicRepoCache,
 	}
 	return
 

pkg/collector/handler_vbc.go

@@ -194,15 +194,15 @@ func NewVbcHandler(cred common.CredentialIface, c *TcProductCollector, logger lo
 		return nil, err
 	}
 	reloadInterval := time.Duration(c.ProductConf.ReloadIntervalMinutes * int64(time.Minute))
-	dRegionRepoCahe := instance.NewVbcTcInstanceDRegionRepositoryCache(dRegionRepo, reloadInterval, logger)
+	dRegionRepoCache := instance.NewVbcTcInstanceDRegionRepositoryCache(dRegionRepo, reloadInterval, logger)
 
 	handler = &VbcHandler{
 		baseProductHandler: baseProductHandler{
 			monitorQueryKey: VbcInstanceidKey,
 			collector:       c,
 			logger:          logger,
 		},
-		dRegionRepo: dRegionRepoCahe,
+		dRegionRepo: dRegionRepoCache,
 	}
 	return
 

pkg/collector/handler_zookeeper.go

@@ -201,22 +201,22 @@ func NewZookeeperHandler(cred common.CredentialIface, c *TcProductCollector, log
 		return nil, err
 	}
 	reloadInterval := time.Duration(c.ProductConf.ReloadIntervalMinutes * int64(time.Minute))
-	podRepoCahe := instance.NewTcZookeeperInstancePodCache(podRepo, reloadInterval, logger)
+	podRepoCache := instance.NewTcZookeeperInstancePodCache(podRepo, reloadInterval, logger)
 
 	interfaceRepo, err := instance.NewZookeeperTcInstanceInterfaceRepository(cred, c.Conf, logger)
 	if err != nil {
 		return nil, err
 	}
-	interfaceRepoCahe := instance.NewTcZookeeperInstanceInterfaceCache(interfaceRepo, reloadInterval, logger)
+	interfaceRepoCache := instance.NewTcZookeeperInstanceInterfaceCache(interfaceRepo, reloadInterval, logger)
 
 	handler = &ZookeeperHandler{
 		baseProductHandler: baseProductHandler{
 			monitorQueryKey: ZookeeperInstanceidKey,
 			collector:       c,
 			logger:          logger,
 		},
-		podRepo:       podRepoCahe,
-		interfaceRepo: interfaceRepoCahe,
+		podRepo:       podRepoCache,
+		interfaceRepo: interfaceRepoCache,
 	}
 	return
 }