From 1cc65cfa12ca311c8773d822033a528d7ed29e44 Mon Sep 17 00:00:00 2001
From: Cameron Sparr <cameronsparr@gmail.com>
Date: Wed, 23 Mar 2016 08:57:05 -0600
Subject: [PATCH] Don't log every string metric that prometheus doesnt support

---
 .../prometheus_client/prometheus_client.go     | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

diff --git a/plugins/outputs/prometheus_client/prometheus_client.go b/plugins/outputs/prometheus_client/prometheus_client.go
index 79a838304..d5e3f1ced 100644
--- a/plugins/outputs/prometheus_client/prometheus_client.go
+++ b/plugins/outputs/prometheus_client/prometheus_client.go
@@ -96,6 +96,15 @@ func (p *PrometheusClient) Write(metrics []telegraf.Metric) error {
 		}
 
 		for n, val := range point.Fields() {
+			// Ignore string and bool fields.
+			switch val.(type) {
+			case string:
+				continue
+			case bool:
+				continue
+			}
+
+			// sanitize the measurement name
 			n = sanitizedChars.Replace(n)
 			var mname string
 			if n == "value" {
@@ -104,15 +113,17 @@ func (p *PrometheusClient) Write(metrics []telegraf.Metric) error {
 				mname = fmt.Sprintf("%s_%s", key, n)
 			}
 
+			// verify that it is a valid measurement name
 			if !metricName.MatchString(mname) {
 				continue
 			}
 
+			// Create a new metric if it hasn't been created yet.
 			if _, ok := p.metrics[mname]; !ok {
 				p.metrics[mname] = prometheus.NewUntypedVec(
 					prometheus.UntypedOpts{
 						Name: mname,
-						Help: fmt.Sprintf("Telegraf collected point '%s'", mname),
+						Help: "Telegraf collected metric",
 					},
 					labels,
 				)
@@ -123,9 +134,6 @@ func (p *PrometheusClient) Write(metrics []telegraf.Metric) error {
 			}
 
 			switch val := val.(type) {
-			default:
-				log.Printf("Prometheus output, unsupported type. key: %s, type: %T\n",
-					mname, val)
 			case int64:
 				m, err := p.metrics[mname].GetMetricWith(l)
 				if err != nil {
@@ -144,6 +152,8 @@ func (p *PrometheusClient) Write(metrics []telegraf.Metric) error {
 					continue
 				}
 				m.Set(val)
+			default:
+				continue
 			}
 		}
 	}