Merge pull request #89 from zianazhao/master

fix:dts

Author: zero3233

pkg/collector/handler_dts.go

@@ -149,9 +149,10 @@ func (h *dtsHandler) getSeriesByMetricType(m *metric.TcmMetric, ins instance.TcI
 
 func (h *dtsHandler) getInstanceSeries(m *metric.TcmMetric, ins instance.TcInstance) ([]*metric.TcmSeries, error) {
 	var series []*metric.TcmSeries
-
+	subscribeName, err := ins.GetFieldValueByName("SubscribeName")
 	ql := map[string]string{
 		h.monitorQueryKey: ins.GetMonitorQueryKey(),
+		"subscribe_name":  subscribeName,
 	}
 	s, err := metric.NewTcmSeries(m, ql, ins)
 	if err != nil {
@@ -170,7 +171,8 @@ func (h *dtsHandler) getReplicationSeries(m *metric.TcmMetric, ins instance.TcIn
 	}
 	for _, replication := range replications.Response.JobList {
 		ql := map[string]string{
-			"replicationjobid": *replication.JobId,
+			"replicationjobid":   *replication.JobId,
+			"replicationjob_ame": *replication.JobName,
 		}
 		s, err := metric.NewTcmSeries(m, ql, ins)
 		if err != nil {
@@ -188,7 +190,8 @@ func (h *dtsHandler) getMigrateInfoSeries(m *metric.TcmMetric, ins instance.TcIn
 	}
 	for _, migrateInfo := range migrateInfos.Response.JobList {
 		ql := map[string]string{
-			"migratejob_id": *migrateInfo.JobId,
+			"migratejob_id":   *migrateInfo.JobId,
+			"migratejob_name": *migrateInfo.JobName,
 		}
 		s, err := metric.NewTcmSeries(m, ql, ins)
 		if err != nil {
@@ -205,22 +208,22 @@ func NewDTSHandler(cred common.CredentialIface, c *TcProductCollector, logger lo
 	if err != nil {
 		return nil, err
 	}
-	relodInterval := time.Duration(c.ProductConf.RelodIntervalMinutes * int64(time.Minute))
-	migrateInfosRepoCache := instance.NewTcDtsInstanceMigrateInfosCache(migrateInfosRepo, relodInterval, logger)
+	reloadInterval := time.Duration(c.ProductConf.RelodIntervalMinutes * int64(time.Minute))
+	migrateInfosRepoCahe := instance.NewTcDtsInstanceMigrateInfosCache(migrateInfosRepo, reloadInterval, logger)
 
 	replicationRepo, err := instance.NewDtsTcInstanceReplicationsRepository(cred, c.Conf, logger)
 	if err != nil {
 		return nil, err
 	}
-	replicationRepoCache := instance.NewTcDtsInstanceReplicationsInfosCache(replicationRepo, relodInterval, logger)
+	replicationRepoCache := instance.NewTcDtsInstanceReplicationsInfosCache(replicationRepo, reloadInterval, logger)
 
 	handler = &dtsHandler{
 		baseProductHandler: baseProductHandler{
 			monitorQueryKey: DTSInstanceidKey,
 			collector:       c,
 			logger:          logger,
 		},
-		migrateInfosRepo: migrateInfosRepoCache,
+		migrateInfosRepo: migrateInfosRepoCahe,
 		replicationRepo:  replicationRepoCache,
 	}
 	return

pkg/instance/instance_dts.go

@@ -10,8 +10,6 @@ import (
 type DtsTcInstance struct {
 	baseTcInstance
 	meta            *sdk.SubscribeInfo
-	subscribeMeta   *sdk.SubscribeInfo
-	migrateInfoMeta *sdk.MigrateJobInfo
 }
 
 func (ins *DtsTcInstance) GetMeta() interface{} {

pkg/metric/label.go

@@ -53,7 +53,6 @@ func (l *TcmLabels) GetValues(filters map[string]string, ins instance.TcInstance
 				for _, value := range values {
 					nameValues[vName] = value
 				}
-
 			}
 		}
 	}