From aabc7e7d4f04171cd39fdd945461ae53728d7402 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Tue, 10 Dec 2019 12:59:16 -0800
Subject: [PATCH] Replace colon chars in prometheus output labels with
 metric_version=1 (#6781)

---
 .../prometheus_client_v1_test.go              | 28 +++++++++++++++++++
 .../outputs/prometheus_client/v1/collector.go | 13 +++++----
 .../serializers/prometheus/prometheus_test.go | 22 +++++++++++++++
 3 files changed, 57 insertions(+), 6 deletions(-)

diff --git a/plugins/outputs/prometheus_client/prometheus_client_v1_test.go b/plugins/outputs/prometheus_client/prometheus_client_v1_test.go
index 6a9770fdc..adf18c9f0 100644
--- a/plugins/outputs/prometheus_client/prometheus_client_v1_test.go
+++ b/plugins/outputs/prometheus_client/prometheus_client_v1_test.go
@@ -103,6 +103,34 @@ cpu_time_idle{host="example.org"} 42
 # HELP cpu_time_idle Telegraf collected metric
 # TYPE cpu_time_idle counter
 cpu_time_idle{host="example.org"} 42
+`),
+		},
+		{
+			name: "replace characters when using string as label",
+			output: &PrometheusClient{
+				Listen:            ":0",
+				MetricVersion:     1,
+				CollectorsExclude: []string{"gocollector", "process"},
+				Path:              "/metrics",
+				StringAsLabel:     true,
+				Log:               Logger,
+			},
+			metrics: []telegraf.Metric{
+				testutil.MustMetric(
+					"cpu_time_idle",
+					map[string]string{},
+					map[string]interface{}{
+						"host:name": "example.org",
+						"counter":   42.0,
+					},
+					time.Unix(0, 0),
+					telegraf.Counter,
+				),
+			},
+			expected: []byte(`
+# HELP cpu_time_idle Telegraf collected metric
+# TYPE cpu_time_idle counter
+cpu_time_idle{host_name="example.org"} 42
 `),
 		},
 		{
diff --git a/plugins/outputs/prometheus_client/v1/collector.go b/plugins/outputs/prometheus_client/v1/collector.go
index 72b09be08..7932bbc59 100644
--- a/plugins/outputs/prometheus_client/v1/collector.go
+++ b/plugins/outputs/prometheus_client/v1/collector.go
@@ -10,6 +10,7 @@ import (
 	"time"
 
 	"github.com/influxdata/telegraf"
+	serializer "github.com/influxdata/telegraf/plugins/serializers/prometheus"
 	"github.com/prometheus/client_golang/prometheus"
 )
 
@@ -201,11 +202,11 @@ func (c *Collector) Add(metrics []telegraf.Metric) error {
 
 		labels := make(map[string]string)
 		for k, v := range tags {
-			tName := sanitize(k)
-			if !isValidTagName(tName) {
+			name, ok := serializer.SanitizeLabelName(k)
+			if !ok {
 				continue
 			}
-			labels[tName] = v
+			labels[name] = v
 		}
 
 		// Prometheus doesn't have a string value type, so convert string
@@ -214,11 +215,11 @@ func (c *Collector) Add(metrics []telegraf.Metric) error {
 			for fn, fv := range point.Fields() {
 				switch fv := fv.(type) {
 				case string:
-					tName := sanitize(fn)
-					if !isValidTagName(tName) {
+					name, ok := serializer.SanitizeLabelName(fn)
+					if !ok {
 						continue
 					}
-					labels[tName] = fv
+					labels[name] = fv
 				}
 			}
 		}
diff --git a/plugins/serializers/prometheus/prometheus_test.go b/plugins/serializers/prometheus/prometheus_test.go
index 632ca148e..ff082f7b2 100644
--- a/plugins/serializers/prometheus/prometheus_test.go
+++ b/plugins/serializers/prometheus/prometheus_test.go
@@ -550,6 +550,28 @@ cpu_time_idle{cpu="cpu0"} 42
 # HELP cpu_time_idle Telegraf collected metric
 # TYPE cpu_time_idle untyped
 cpu_time_idle{cpu="cpu0"} 42
+`),
+		},
+		{
+			name: "replace characters when using string as label",
+			config: FormatConfig{
+				StringHandling: StringAsLabel,
+			},
+			metrics: []telegraf.Metric{
+				testutil.MustMetric(
+					"cpu",
+					map[string]string{},
+					map[string]interface{}{
+						"host:name": "example.org",
+						"time_idle": 42.0,
+					},
+					time.Unix(1574279268, 0),
+				),
+			},
+			expected: []byte(`
+# HELP cpu_time_idle Telegraf collected metric
+# TYPE cpu_time_idle untyped
+cpu_time_idle{host_name="example.org"} 42
 `),
 		},
 		{