Merge pull request #309 from prometheus/mr/issue-256

Allow single-letter components in metric names
prometheus · Jun 19, 2020 · ed37775 · ed37775
2 parents 7ba3550 + 44ae8f5
commit ed37775
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 1 deletion.
diff --git a/pkg/mapper/mapper.go b/pkg/mapper/mapper.go
@@ -27,7 +27,7 @@ import (
 )
 
 var (
-	statsdMetricRE    = `[a-zA-Z_](-?[a-zA-Z0-9_])+`
+	statsdMetricRE    = `[a-zA-Z_](-?[a-zA-Z0-9_])*`
 	templateReplaceRE = `(\$\{?\d+\}?)`
 
 	metricLineRE = regexp.MustCompile(`^(\*\.|` + statsdMetricRE + `\.)+(\*|` + statsdMetricRE + `)$`)

diff --git a/pkg/mapper/mapper_test.go b/pkg/mapper/mapper_test.go
@@ -742,6 +742,29 @@ mappings:
     `,
 			configBad: true,
 		},
+		{
+			config: `---
+mappings:
+- match: p.*.*.c.*
+  match_type: glob
+  name: issue_256
+  labels:
+    one: $1
+    two: $2
+    three: $3
+`,
+			mappings: mappings{
+				{
+					statsdMetric: "p.one.two.c.three",
+					name:         "issue_256",
+					labels: map[string]string{
+						"one":   "one",
+						"two":   "two",
+						"three": "three",
+					},
+				},
+			},
+		},
 		// Example from the README.
 		{
 			config: `