Allow colons in metric names in prometheus_client output (influxdata#…

…5680)
hwaastad · Jun 13, 2019 · 323a01b · 323a01b
1 parent b9b1124
commit 323a01b
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/plugins/outputs/prometheus_client/prometheus_client.go b/plugins/outputs/prometheus_client/prometheus_client.go
@@ -25,7 +25,7 @@ import (
 )
 
 var (
-	invalidNameCharRE = regexp.MustCompile(`[^a-zA-Z0-9_]`)
+	invalidNameCharRE = regexp.MustCompile(`[^a-zA-Z0-9_:]`)
 	validNameCharRE   = regexp.MustCompile(`^[a-zA-Z_][a-zA-Z0-9_]*`)
 )
 

diff --git a/plugins/outputs/prometheus_client/prometheus_client_test.go b/plugins/outputs/prometheus_client/prometheus_client_test.go
@@ -186,15 +186,15 @@ func TestWrite_Sanitize(t *testing.T) {
 	client := NewClient()
 
 	p1, err := metric.New(
-		"foo.bar",
+		"foo.bar:colon",
 		map[string]string{"tag-with-dash": "localhost.local"},
-		map[string]interface{}{"field-with-dash": 42},
+		map[string]interface{}{"field-with-dash-and:colon": 42},
 		time.Now(),
 		telegraf.Counter)
 	err = client.Write([]telegraf.Metric{p1})
 	require.NoError(t, err)
 
-	fam, ok := client.fam["foo_bar_field_with_dash"]
+	fam, ok := client.fam["foo_bar:colon_field_with_dash_and:colon"]
 	require.True(t, ok)
 	require.Equal(t, map[string]int{"tag_with_dash": 1}, fam.LabelSet)