From 3e91a37dee481869b613fb5e8f535aa477c0c346 Mon Sep 17 00:00:00 2001 From: Holger Obermaier <40787752+ho-ob@users.noreply.github.com> Date: Tue, 22 Nov 2022 17:02:29 +0100 Subject: [PATCH] remove prefix enumeration like 01-... --- receivers/ipmiReceiver.go | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/receivers/ipmiReceiver.go b/receivers/ipmiReceiver.go index 798da21..b00df96 100644 --- a/receivers/ipmiReceiver.go +++ b/receivers/ipmiReceiver.go @@ -7,6 +7,7 @@ import ( "fmt" "io" "os/exec" + "regexp" "strconv" "strings" "sync" @@ -100,6 +101,7 @@ func (r *IPMIReceiver) doReadMetric() { idxUnits idxEvent ) + numPrefixRegex := regexp.MustCompile("^[[:digit:]][[:digit:]]-(.*)$") scanner := bufio.NewScanner(stdout) for scanner.Scan() { // Read host @@ -124,7 +126,13 @@ func (r *IPMIReceiver) doReadMetric() { metric := strings.ToLower(v2[idxType]) name := strings.ToLower( - strings.Replace(v2[idxName], " ", "_", -1)) + strings.Replace( + strings.TrimSpace( + v2[idxName]), " ", "_", -1)) + // remove prefix enumeration like 01-... + if v := numPrefixRegex.FindStringSubmatch(name); v != nil { + name = v[1] + } unit := v2[idxUnits] if unit == "Watts" {