Skip to content

Commit ca0b37e

Browse files
zero3233zero3233
authored
Merge pull request #103 from zianazhao/master
fix
2 parents 23a7c89 + 0641721 commit ca0b37e

File tree

8 files changed

+49
-36
lines changed

8 files changed

+49
-36
lines changed

‎go.mod‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ require (
1212
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cbs v1.0.334
1313
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cdb v1.0.413
1414
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cdn v1.0.437
15-
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cfs v1.0.634 // indirect
15+
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cfs v1.0.634
1616
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/ckafka v1.0.334
1717
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/clb v1.0.334
1818
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cmq v1.0.334
@@ -35,7 +35,7 @@ require (
3535
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/tdmq v1.0.413
3636
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/tse v1.0.430
3737
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/vpc v1.0.334
38-
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/waf v1.0.576 // indirect
38+
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/waf v1.0.576
3939
github.com/tencentyun/cos-go-sdk-v5 v0.7.35
4040
golang.org/x/time v0.0.0-20200630173020-3af7569d3a1e
4141
gopkg.in/alecthomas/kingpin.v2 v2.2.6

‎pkg/collector/handler_cbs.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -214,7 +214,7 @@ func (h *cbsHandler) getInstanceSeries(m *metric.TcmMetric, ins instance.TcInsta
214214
}
215215

216216
func NewCbsHandler(cred common.CredentialIface, c *TcProductCollector, logger log.Logger) (handler ProductHandler, err error) {
217-
instanceInfosRepoCahe, err := instance.NewCbsTcInstanceInfosRepository(cred, c.Conf, logger)
217+
instanceInfosRepoCache, err := instance.NewCbsTcInstanceInfosRepository(cred, c.Conf, logger)
218218
if err != nil {
219219
return nil, err
220220
}
@@ -225,7 +225,7 @@ func NewCbsHandler(cred common.CredentialIface, c *TcProductCollector, logger lo
225225
collector: c,
226226
logger: logger,
227227
},
228-
instanceInfosRepo: instanceInfosRepoCahe,
228+
instanceInfosRepo: instanceInfosRepoCache,
229229
}
230230
return
231231

‎pkg/collector/handler_dts.go‎

Lines changed: 29 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ import (
1313

1414
const (
1515
DTSNamespace = "QCE/DTS"
16-
DTSInstanceidKey = "SubscribeId"
16+
DTSInstanceIdKey = "SubscribeId"
1717
)
1818

1919
func init() {
@@ -85,23 +85,36 @@ func (h *dtsHandler) GetSeriesByOnly(m *metric.TcmMetric) ([]*metric.TcmSeries,
8585
}
8686

8787
func (h *dtsHandler) GetSeriesByAll(m *metric.TcmMetric) ([]*metric.TcmSeries, error) {
88-
var slist []*metric.TcmSeries
89-
insList, err := h.collector.InstanceRepo.ListByFilters(m.Conf.InstanceFilters)
90-
if err != nil {
91-
return nil, err
88+
var dimensions []string
89+
for _, v := range m.Meta.SupportDimensions {
90+
dimensions = append(dimensions, v)
9291
}
93-
for _, ins := range insList {
94-
if len(m.Conf.ExcludeInstances) != 0 && util.IsStrInList(m.Conf.ExcludeInstances, ins.GetInstanceId()) {
95-
continue
96-
}
97-
sl, err := h.getSeriesByMetricType(m, ins)
92+
var slist []*metric.TcmSeries
93+
if util.IsStrInList(dimensions, "replicationjobid") || util.IsStrInList(dimensions, "migratejobid") {
94+
sl, err := h.getSeriesByMetricType(m, nil)
9895
if err != nil {
99-
level.Error(h.logger).Log("msg", "Create metric series fail",
100-
"metric", m.Meta.MetricName, "instance", ins.GetInstanceId())
101-
continue
96+
level.Error(h.logger).Log("msg", "Create metric series fail", "metric", m.Meta.MetricName)
10297
}
10398
slist = append(slist, sl...)
99+
} else {
100+
insList, err := h.collector.InstanceRepo.ListByFilters(m.Conf.InstanceFilters)
101+
if err != nil {
102+
return nil, err
103+
}
104+
for _, ins := range insList {
105+
if len(m.Conf.ExcludeInstances) != 0 && util.IsStrInList(m.Conf.ExcludeInstances, ins.GetInstanceId()) {
106+
continue
107+
}
108+
sl, err := h.getSeriesByMetricType(m, ins)
109+
if err != nil {
110+
level.Error(h.logger).Log("msg", "Create metric series fail",
111+
"metric", m.Meta.MetricName, "instance", ins.GetInstanceId())
112+
continue
113+
}
114+
slist = append(slist, sl...)
115+
}
104116
}
117+
105118
return slist, nil
106119
}
107120

@@ -209,7 +222,7 @@ func NewDTSHandler(cred common.CredentialIface, c *TcProductCollector, logger lo
209222
return nil, err
210223
}
211224
reloadInterval := time.Duration(c.ProductConf.ReloadIntervalMinutes * int64(time.Minute))
212-
migrateInfosRepoCahe := instance.NewTcDtsInstanceMigrateInfosCache(migrateInfosRepo, reloadInterval, logger)
225+
migrateInfosRepoCache := instance.NewTcDtsInstanceMigrateInfosCache(migrateInfosRepo, reloadInterval, logger)
213226

214227
replicationRepo, err := instance.NewDtsTcInstanceReplicationsRepository(cred, c.Conf, logger)
215228
if err != nil {
@@ -219,11 +232,11 @@ func NewDTSHandler(cred common.CredentialIface, c *TcProductCollector, logger lo
219232

220233
handler = &dtsHandler{
221234
baseProductHandler: baseProductHandler{
222-
monitorQueryKey: DTSInstanceidKey,
235+
monitorQueryKey: DTSInstanceIdKey,
223236
collector: c,
224237
logger: logger,
225238
},
226-
migrateInfosRepo: migrateInfosRepoCahe,
239+
migrateInfosRepo: migrateInfosRepoCache,
227240
replicationRepo: replicationRepoCache,
228241
}
229242
return

‎pkg/collector/handler_nacos.go‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -200,21 +200,21 @@ func NewNacosHandler(cred common.CredentialIface, c *TcProductCollector, logger
200200
return nil, err
201201
}
202202
reloadInterval := time.Duration(c.ProductConf.ReloadIntervalMinutes * int64(time.Minute))
203-
podRepoCahe := instance.NewTcNacosInstancePodCache(podRepo, reloadInterval, logger)
203+
podRepoCache := instance.NewTcNacosInstancePodCache(podRepo, reloadInterval, logger)
204204

205205
interfaceRepo, err := instance.NewNacosTcInstanceInterfaceRepository(cred, c.Conf, logger)
206206
if err != nil {
207207
return nil, err
208208
}
209-
interfaceRepoCahe := instance.NewTcNacosInstanceInterfaceCache(interfaceRepo, reloadInterval, logger)
209+
interfaceRepoCache := instance.NewTcNacosInstanceInterfaceCache(interfaceRepo, reloadInterval, logger)
210210
handler = &NacosHandler{
211211
baseProductHandler: baseProductHandler{
212212
monitorQueryKey: NacosInstanceidKey,
213213
collector: c,
214214
logger: logger,
215215
},
216-
podRepo: podRepoCahe,
217-
interfaceRepo: interfaceRepoCahe,
216+
podRepo: podRepoCache,
217+
interfaceRepo: interfaceRepoCache,
218218
}
219219
return
220220

‎pkg/collector/handler_redis_mem.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -216,15 +216,15 @@ func NewRedisMemHandler(cred common.CredentialIface, c *TcProductCollector, logg
216216
return nil, err
217217
}
218218
reloadInterval := time.Duration(c.ProductConf.ReloadIntervalMinutes * int64(time.Minute))
219-
nodeRepoCahe := instance.NewTcRedisInstanceNodeCache(nodeRepo, reloadInterval, logger)
219+
nodeRepoCache := instance.NewTcRedisInstanceNodeCache(nodeRepo, reloadInterval, logger)
220220

221221
handler := &redisMemHandler{
222222
baseProductHandler: baseProductHandler{
223223
monitorQueryKey: RedisMemInstanceidKey,
224224
collector: c,
225225
logger: logger,
226226
},
227-
nodeRepo: nodeRepoCahe,
227+
nodeRepo: nodeRepoCache,
228228
}
229229
return handler, nil
230230
}

‎pkg/collector/handler_tdmq.go‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -211,22 +211,22 @@ func NewTdmqHandler(cred common.CredentialIface, c *TcProductCollector, logger l
211211
return nil, err
212212
}
213213
reloadInterval := time.Duration(c.ProductConf.ReloadIntervalMinutes * int64(time.Minute))
214-
namespaceRepoCahe := instance.NewTcTdmqInstanceNamespaceCache(namespaceRepo, reloadInterval, logger)
214+
namespaceRepoCache := instance.NewTcTdmqInstanceNamespaceCache(namespaceRepo, reloadInterval, logger)
215215

216216
topicRepo, err := instance.NewTdmqTcInstanceRocketMQTopicsRepository(cred, c.Conf, logger)
217217
if err != nil {
218218
return nil, err
219219
}
220-
topicRepoCahe := instance.NewTcTdmqInstanceTopicsCache(topicRepo, reloadInterval, logger)
220+
topicRepoCache := instance.NewTcTdmqInstanceTopicsCache(topicRepo, reloadInterval, logger)
221221

222222
handler = &tdmqHandler{
223223
baseProductHandler: baseProductHandler{
224224
monitorQueryKey: TdmqInstanceidKey,
225225
collector: c,
226226
logger: logger,
227227
},
228-
namespaceRepo: namespaceRepoCahe,
229-
topicRepo: topicRepoCahe,
228+
namespaceRepo: namespaceRepoCache,
229+
topicRepo: topicRepoCache,
230230
}
231231
return
232232

‎pkg/collector/handler_vbc.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -194,15 +194,15 @@ func NewVbcHandler(cred common.CredentialIface, c *TcProductCollector, logger lo
194194
return nil, err
195195
}
196196
reloadInterval := time.Duration(c.ProductConf.ReloadIntervalMinutes * int64(time.Minute))
197-
dRegionRepoCahe := instance.NewVbcTcInstanceDRegionRepositoryCache(dRegionRepo, reloadInterval, logger)
197+
dRegionRepoCache := instance.NewVbcTcInstanceDRegionRepositoryCache(dRegionRepo, reloadInterval, logger)
198198

199199
handler = &VbcHandler{
200200
baseProductHandler: baseProductHandler{
201201
monitorQueryKey: VbcInstanceidKey,
202202
collector: c,
203203
logger: logger,
204204
},
205-
dRegionRepo: dRegionRepoCahe,
205+
dRegionRepo: dRegionRepoCache,
206206
}
207207
return
208208

‎pkg/collector/handler_zookeeper.go‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -201,22 +201,22 @@ func NewZookeeperHandler(cred common.CredentialIface, c *TcProductCollector, log
201201
return nil, err
202202
}
203203
reloadInterval := time.Duration(c.ProductConf.ReloadIntervalMinutes * int64(time.Minute))
204-
podRepoCahe := instance.NewTcZookeeperInstancePodCache(podRepo, reloadInterval, logger)
204+
podRepoCache := instance.NewTcZookeeperInstancePodCache(podRepo, reloadInterval, logger)
205205

206206
interfaceRepo, err := instance.NewZookeeperTcInstanceInterfaceRepository(cred, c.Conf, logger)
207207
if err != nil {
208208
return nil, err
209209
}
210-
interfaceRepoCahe := instance.NewTcZookeeperInstanceInterfaceCache(interfaceRepo, reloadInterval, logger)
210+
interfaceRepoCache := instance.NewTcZookeeperInstanceInterfaceCache(interfaceRepo, reloadInterval, logger)
211211

212212
handler = &ZookeeperHandler{
213213
baseProductHandler: baseProductHandler{
214214
monitorQueryKey: ZookeeperInstanceidKey,
215215
collector: c,
216216
logger: logger,
217217
},
218-
podRepo: podRepoCahe,
219-
interfaceRepo: interfaceRepoCahe,
218+
podRepo: podRepoCache,
219+
interfaceRepo: interfaceRepoCache,
220220
}
221221
return
222222
}

0 commit comments

Comments
 (0)