diff --git a/.github/workflows/docker-publish.yml b/.github/workflows/docker-publish.yml index f2f338d..6a686bc 100644 --- a/.github/workflows/docker-publish.yml +++ b/.github/workflows/docker-publish.yml @@ -39,9 +39,9 @@ jobs: # https://github.com/sigstore/cosign-installer - name: Install cosign if: github.event_name != 'pull_request' - uses: sigstore/cosign-installer@14d43345ff50608baaa37893f4822c406ed470a9 + uses: sigstore/cosign-installer@main with: - cosign-release: 'v1.11.1' + cosign-release: 'v1.13.1' # Workaround: https://github.com/docker/build-push-action/issues/461 diff --git a/pkg/collector/handler_dts.go b/pkg/collector/handler_dts.go index 51d8e5d..476842a 100644 --- a/pkg/collector/handler_dts.go +++ b/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,14 +208,14 @@ 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{ @@ -220,7 +223,7 @@ func NewDTSHandler(cred common.CredentialIface, c *TcProductCollector, logger lo collector: c, logger: logger, }, - migrateInfosRepo: migrateInfosRepoCache, + migrateInfosRepo: migrateInfosRepoCahe, replicationRepo: replicationRepoCache, } return diff --git a/pkg/instance/instance_dts.go b/pkg/instance/instance_dts.go index bd32651..bc0352e 100644 --- a/pkg/instance/instance_dts.go +++ b/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{} { diff --git a/pkg/metric/label.go b/pkg/metric/label.go index 7b99ebc..1987e56 100644 --- a/pkg/metric/label.go +++ b/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 } - } } }