Fix double pct replacement in sysstat input (influxdata#6001)

bitcharmer · Oct 18, 2019 · 5e1d708 · 5e1d708
1 parent 30579a4
commit 5e1d708
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 0 deletions.
diff --git a/plugins/inputs/sysstat/sysstat.go b/plugins/inputs/sysstat/sysstat.go
@@ -335,6 +335,7 @@ func (s *Sysstat) sadfOptions(activityOption string) []string {
 // escape removes % and / chars in field names
 func escape(dirty string) string {
 	var fieldEscaper = strings.NewReplacer(
+		`%%`, "pct_",
 		`%`, "pct_",
 		`/`, "_per_",
 	)

diff --git a/plugins/inputs/sysstat/sysstat_test.go b/plugins/inputs/sysstat/sysstat_test.go
@@ -225,6 +225,10 @@ func TestEscape(t *testing.T) {
 			"%util",
 			"pct_util",
 		},
+		{
+			"%%util",
+			"pct_util",
+		},
 		{
 			"bread/s",
 			"bread_per_s",