From 9eac319317468fda4b408e5c83f958bbdb3acf1d Mon Sep 17 00:00:00 2001
From: Thomas Roehl <Thomas.Roehl@googlemail.com>
Date: Fri, 11 Mar 2022 12:52:43 +0100
Subject: [PATCH] Also check for Ganglia renames for the oldname

---
 sinks/gangliaCommon.go | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

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