Merge pull request #381 from evandam/allow-multi-dash

allow multiple dashes in StatsD metric names
This commit is contained in:
Matthias Rampke 2021-08-31 17:55:00 +02:00 committed by GitHub
commit a9c883a298
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 19 additions and 4 deletions

View file

@ -30,10 +30,10 @@ import (
var (
// The first segment of a match cannot start with a number
statsdMetricRE = `[a-zA-Z_](-?[a-zA-Z0-9_])*`
statsdMetricRE = `[a-zA-Z_]([a-zA-Z0-9_\-])*`
// The subsequent segments of a match can start with a number
// See https://github.com/prometheus/statsd_exporter/issues/328
statsdMetricSubsequentRE = `[a-zA-Z0-9_](-?[a-zA-Z0-9_])*`
statsdMetricSubsequentRE = `[a-zA-Z0-9_]([a-zA-Z0-9_\-])*`
templateReplaceRE = `(\$\{?\d+\}?)`
metricLineRE = regexp.MustCompile(`^(\*|` + statsdMetricRE + `)(\.\*|\.` + statsdMetricSubsequentRE + `)*$`)

View file

@ -68,7 +68,7 @@ func TestMetricMapperYAML(t *testing.T) {
mappings:
- match: test.dispatcher.*.*.*
name: "dispatch_events"
labels:
labels:
processor: "$1"
action: "$2"
result: "$3"
@ -430,12 +430,27 @@ mappings:
testName: "Config with bad metric line",
config: `---
mappings:
- match: bad--metric-line.*.*
- match: bad!!metric-line.*.*
name: "foo"
labels: {}
`,
configBad: true,
},
{
testName: "Config with multiple dashes in metric name",
config: `---
mappings:
- match: "foo--bar.*"
name: "foo_bar_${1}"
labels: {}
`,
mappings: mappings{
{
statsdMetric: "foo--bar.count",
name: "foo_bar_count",
},
},
},
{
testName: "Config with dynamic metric name",
config: `---