dom
/
telegraf
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Remove tags that would create invalid label names in prometheus output (#5663)

This commit is contained in:
Greg 2019-04-02 13:42:48 -06:00 committed by Daniel Nelson
parent 42cc84c262
commit d738892c0b
1 changed files with 29 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
plugins/outputs/prometheus_client/prometheus_client.go
View File

@ -24,7 +24,10 @@ import (
"github.com/prometheus/client_golang/prometheus/promhttp" "github.com/prometheus/client_golang/prometheus/promhttp"
) )
var invalidNameCharRE = regexp.MustCompile(`[^a-zA-Z0-9_]`) var (
invalidNameCharRE = regexp.MustCompile(`[^a-zA-Z0-9_]`)
validNameCharRE = regexp.MustCompile(`^[a-zA-Z_][a-zA-Z0-9_]*`)
)
// SampleID uniquely identifies a Sample // SampleID uniquely identifies a Sample
type SampleID string type SampleID string
@ -343,6 +346,10 @@ func sanitize(value string) string {
return invalidNameCharRE.ReplaceAllString(value, "_") return invalidNameCharRE.ReplaceAllString(value, "_")
} }
func isValidTagName(tag string) bool {
return validNameCharRE.MatchString(tag)
}
func getPromValueType(tt telegraf.ValueType) prometheus.ValueType { func getPromValueType(tt telegraf.ValueType) prometheus.ValueType {
switch tt { switch tt {
case telegraf.Counter: case telegraf.Counter:
@ -414,7 +421,11 @@ func (p *PrometheusClient) Write(metrics []telegraf.Metric) error {
labels := make(map[string]string) labels := make(map[string]string)
for k, v := range tags { for k, v := range tags {
labels[sanitize(k)] = v tName := sanitize(k)
if !isValidTagName(tName) {
continue
}
labels[tName] = v
} }
// Prometheus doesn't have a string value type, so convert string // Prometheus doesn't have a string value type, so convert string
@ -423,7 +434,11 @@ func (p *PrometheusClient) Write(metrics []telegraf.Metric) error {
for fn, fv := range point.Fields() { for fn, fv := range point.Fields() {
switch fv := fv.(type) { switch fv := fv.(type) {
case string: case string:
labels[sanitize(fn)] = fv tName := sanitize(fn)
if !isValidTagName(tName) {
continue
}
labels[tName] = fv
} }
} }
} }
@ -469,6 +484,10 @@ func (p *PrometheusClient) Write(metrics []telegraf.Metric) error {
} }
mname = sanitize(point.Name()) mname = sanitize(point.Name())
if !isValidTagName(mname) {
continue
}
p.addMetricFamily(point, sample, mname, sampleID) p.addMetricFamily(point, sample, mname, sampleID)
case telegraf.Histogram: case telegraf.Histogram:
@ -511,6 +530,10 @@ func (p *PrometheusClient) Write(metrics []telegraf.Metric) error {
} }
mname = sanitize(point.Name()) mname = sanitize(point.Name())
if !isValidTagName(mname) {
continue
}
p.addMetricFamily(point, sample, mname, sampleID) p.addMetricFamily(point, sample, mname, sampleID)
default: default:
@ -555,7 +578,9 @@ func (p *PrometheusClient) Write(metrics []telegraf.Metric) error {
mname = sanitize(fmt.Sprintf("%s_%s", point.Name(), fn)) mname = sanitize(fmt.Sprintf("%s_%s", point.Name(), fn))
} }
} }
if !isValidTagName(mname) {
continue
}
p.addMetricFamily(point, sample, mname, sampleID) p.addMetricFamily(point, sample, mname, sampleID)
} }