ClusterCockpit/cc-metric-collector
1
0
Fork 0
mirror of https://github.com/ClusterCockpit/cc-metric-collector.git synced 2025-04-08 22:45:55 +02:00
Code Issues Packages Projects Releases Wiki Activity

Also check for Ganglia renames for the oldname

Browse Source
This commit is contained in:
Thomas Roehl 2022-03-11 12:52:43 +01:00
parent 5a7e12c2b7
commit 9eac319317
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
sinks/gangliaCommon.go
View File

@ -35,8 +35,6 @@ func GangliaMetricRename(name string) string {
return "pkts_out" return "pkts_out"
} else if name == "cpu_iowait" { } else if name == "cpu_iowait" {
return "cpu_wio" return "cpu_wio"
} else if name == "cpu_load" {
return "load_one"
} }
return name return name
} }
@ -156,7 +154,7 @@ type GangliaMetricConfig struct {
func GetCommonGangliaConfig(point lp.CCMetric) GangliaMetricConfig { func GetCommonGangliaConfig(point lp.CCMetric) GangliaMetricConfig {
mname := GangliaMetricRename(point.Name()) mname := GangliaMetricRename(point.Name())
if oldname, ok := point.GetMeta("oldname"); ok { if oldname, ok := point.GetMeta("oldname"); ok {
mname = oldname mname = GangliaMetricRename(oldname)
} }
for _, group := range CommonGangliaMetrics { for _, group := range CommonGangliaMetrics {
for _, metric := range group.Metrics { for _, metric := range group.Metrics {
@ -212,7 +210,7 @@ func GetCommonGangliaConfig(point lp.CCMetric) GangliaMetricConfig {
func GetGangliaConfig(point lp.CCMetric) GangliaMetricConfig { func GetGangliaConfig(point lp.CCMetric) GangliaMetricConfig {
mname := GangliaMetricRename(point.Name()) mname := GangliaMetricRename(point.Name())
if oldname, ok := point.GetMeta("oldname"); ok { if oldname, ok := point.GetMeta("oldname"); ok {
mname = oldname mname = GangliaMetricRename(oldname)
} }
group := "" group := ""
if g, ok := point.GetMeta("group"); ok { if g, ok := point.GetMeta("group"); ok {