From 69606a45e0db6777d4b3620207577d946f82ddee Mon Sep 17 00:00:00 2001
From: Cameron Sparr <cameronsparr@gmail.com>
Date: Tue, 22 Mar 2016 10:34:33 -0600
Subject: [PATCH] Fix prometheus label names, and dont panic if invalid

fixes #907
---
 CHANGELOG.md                                  |  1 +
 plugins/inputs/udp_listener/udp_listener.go   |  2 -
 .../prometheus_client/prometheus_client.go    | 46 +++++++++++++++----
 3 files changed, 37 insertions(+), 12 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index d400b139c..316a8a311 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -18,6 +18,7 @@
 - [#884](https://github.com/influxdata/telegraf/issues/884): Do not call write method if there are 0 metrics to write.
 - [#898](https://github.com/influxdata/telegraf/issues/898): Put database name in quotes, fixes special characters in the database name.
 - [#656](https://github.com/influxdata/telegraf/issues/656): No longer run `lsof` on linux to get netstat data, fixes permissions issue.
+- [#907](https://github.com/influxdata/telegraf/issues/907): Fix prometheus invalid label/measurement name key.
 
 ## v0.11.1 [2016-03-17]
 
diff --git a/plugins/inputs/udp_listener/udp_listener.go b/plugins/inputs/udp_listener/udp_listener.go
index 4b362c478..9b0a65d6f 100644
--- a/plugins/inputs/udp_listener/udp_listener.go
+++ b/plugins/inputs/udp_listener/udp_listener.go
@@ -90,8 +90,6 @@ func (u *UdpListener) Start(acc telegraf.Accumulator) error {
 }
 
 func (u *UdpListener) Stop() {
-	u.Lock()
-	defer u.Unlock()
 	close(u.done)
 	u.listener.Close()
 	u.wg.Wait()
diff --git a/plugins/outputs/prometheus_client/prometheus_client.go b/plugins/outputs/prometheus_client/prometheus_client.go
index f13fe726c..79a838304 100644
--- a/plugins/outputs/prometheus_client/prometheus_client.go
+++ b/plugins/outputs/prometheus_client/prometheus_client.go
@@ -4,12 +4,26 @@ import (
 	"fmt"
 	"log"
 	"net/http"
+	"regexp"
+	"strings"
 
 	"github.com/influxdata/telegraf"
 	"github.com/influxdata/telegraf/plugins/outputs"
 	"github.com/prometheus/client_golang/prometheus"
 )
 
+var (
+	sanitizedChars = strings.NewReplacer("/", "_", "@", "_", " ", "_", "-", "_", ".", "_")
+
+	// Prometheus metric names must match this regex
+	// see https://prometheus.io/docs/concepts/data_model/#metric-names-and-labels
+	metricName = regexp.MustCompile("^[a-zA-Z_:][a-zA-Z0-9_:]*$")
+
+	// Prometheus labels must match this regex
+	// see https://prometheus.io/docs/concepts/data_model/#metric-names-and-labels
+	labelName = regexp.MustCompile("^[a-zA-Z_][a-zA-Z0-9_]*$")
+)
+
 type PrometheusClient struct {
 	Listen  string
 	metrics map[string]*prometheus.UntypedVec
@@ -64,27 +78,36 @@ func (p *PrometheusClient) Write(metrics []telegraf.Metric) error {
 	}
 
 	for _, point := range metrics {
-		var labels []string
 		key := point.Name()
+		key = sanitizedChars.Replace(key)
 
-		for k, _ := range point.Tags() {
-			if len(k) > 0 {
-				labels = append(labels, k)
-			}
-		}
-
+		var labels []string
 		l := prometheus.Labels{}
-		for tk, tv := range point.Tags() {
-			l[tk] = tv
+		for k, v := range point.Tags() {
+			k = sanitizedChars.Replace(k)
+			if len(k) == 0 {
+				continue
+			}
+			if !labelName.MatchString(k) {
+				continue
+			}
+			labels = append(labels, k)
+			l[k] = v
 		}
 
 		for n, val := range point.Fields() {
+			n = sanitizedChars.Replace(n)
 			var mname string
 			if n == "value" {
 				mname = key
 			} else {
 				mname = fmt.Sprintf("%s_%s", key, n)
 			}
+
+			if !metricName.MatchString(mname) {
+				continue
+			}
+
 			if _, ok := p.metrics[mname]; !ok {
 				p.metrics[mname] = prometheus.NewUntypedVec(
 					prometheus.UntypedOpts{
@@ -93,7 +116,10 @@ func (p *PrometheusClient) Write(metrics []telegraf.Metric) error {
 					},
 					labels,
 				)
-				prometheus.MustRegister(p.metrics[mname])
+				if err := prometheus.Register(p.metrics[mname]); err != nil {
+					log.Printf("prometheus_client: Metric failed to register with prometheus, %s", err)
+					continue
+				}
 			}
 
 			switch val := val.(type) {