opensource/cloudpods
3
0
Fork 0
mirror of https://github.com/yunionio/cloudpods.git synced 2026-09-24 16:03:43 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix(cloudmon): bucket and redis metric

Browse Source
This commit is contained in:
ioito
2022-08-30 19:17:13 +08:00
parent 47ff4eb2b7
commit 725442b68e
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/cloudmon/providerdriver/base.go
+2 -2
View File
@@ -896,7 +896,7 @@ func (self *SCollectByMetricTypeDriver) CollectRedisMetrics(ctx context.Context,
}
for _, v := range value.Values {
metric := influxdb.SMetricData{
Name: value.MetricType.Key(),
Name: value.MetricType.Name(),
Timestamp: v.Timestamp,
Tags: []influxdb.SKeyValue{},
Metrics: []influxdb.SKeyValue{
@@ -978,7 +978,7 @@ func (self *SCollectByMetricTypeDriver) CollectBucketMetrics(ctx context.Context
}
for _, v := range value.Values {
metric := influxdb.SMetricData{
Name: value.MetricType.Key(),
Name: value.MetricType.Name(),
Timestamp: v.Timestamp,
Tags: []influxdb.SKeyValue{},
Metrics: []influxdb.SKeyValue{
pkg/cloudmon/resources/resources.go
+1 -1
View File
@@ -660,7 +660,7 @@ func (self *SResources) CollectMetrics(ctx context.Context, userCred mcclient.To
resources = self.KubeClusters.getResources(manager.Id)
clusters := map[string]api.KubeClusterDetails{}
jsonutils.Update(&buckets, resources)
jsonutils.Update(&clusters, resources)
err = driver.CollectK8sMetrics(ctx, manager, provider, clusters, startTime, endTime)
if err != nil && errors.Cause(err) != cloudprovider.ErrNotImplemented && errors.Cause(err) != cloudprovider.ErrNotSupported {
log.Errorf("CollectK8sMetrics for %s(%s) error: %v", manager.Name, manager.Provider, err)