Merge branch 'master' into master

CHANGELOG.md

@@ -17,6 +17,8 @@
 - [#890](https://github.com/influxdata/telegraf/issues/890): Create TLS config even if only ssl_ca is provided.
 - [#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]
 

Godeps

@@ -13,7 +13,6 @@ github.com/davecgh/go-spew 5215b55f46b2b919f50a1df0eaa5886afe4e3b3d
 github.com/eapache/go-resiliency b86b1ec0dd4209a588dc1285cdd471e73525c0b3
 github.com/eapache/queue ded5959c0d4e360646dc9e9908cff48666781367
 github.com/fsouza/go-dockerclient a49c8269a6899cae30da1f8a4b82e0ce945f9967
-github.com/go-ini/ini 776aa739ce9373377cd16f526cdf06cb4c89b40f
 github.com/go-sql-driver/mysql 1fca743146605a172a266e1654e01e5cd5669bee
 github.com/golang/protobuf 552c7b9542c194800fd493123b3798ef0a832032
 github.com/golang/snappy 427fb6fc07997f43afa32f35e850833760e489a7
@@ -24,7 +23,6 @@ github.com/hailocab/go-hostpool e80d13ce29ede4452c43dea11e79b9bc8a15b478
 github.com/influxdata/config b79f6829346b8d6e78ba73544b1e1038f1f1c9da
 github.com/influxdata/influxdb e3fef5593c21644f2b43af55d6e17e70910b0e48
 github.com/influxdata/toml af4df43894b16e3fd2b788d01bd27ad0776ef2d0
-github.com/jmespath/go-jmespath 0b12d6b521d83fc7f755e7cfc1b1fbdd35a01a74
 github.com/klauspost/crc32 19b0b332c9e4516a6370a0456e6182c3b5036720
 github.com/lib/pq e182dc4027e2ded4b19396d638610f2653295f36
 github.com/matttproud/golang_protobuf_extensions d0c3fe89de86839aecf2e0579c40ba3bb336a453
@@ -34,16 +32,14 @@ github.com/naoina/go-stringutil 6b638e95a32d0c1131db0e7fe83775cbea4a0d0b
 github.com/nats-io/nats b13fc9d12b0b123ebc374e6b808c6228ae4234a3
 github.com/nats-io/nuid 4f84f5f3b2786224e336af2e13dba0a0a80b76fa
 github.com/nsqio/go-nsq 0b80d6f05e15ca1930e0c5e1d540ed627e299980
-github.com/pmezard/go-difflib 792786c7400a136282c1664665ae0a8db921c6c2
 github.com/prometheus/client_golang 18acf9993a863f4c4b40612e19cdd243e7c86831
 github.com/prometheus/client_model fa8ad6fec33561be4280a8f0514318c79d7f6cb6
 github.com/prometheus/common e8eabff8812b05acf522b45fdcd725a785188e37
 github.com/prometheus/procfs 406e5b7bfd8201a36e2bb5f7bdae0b03380c2ce8
 github.com/samuel/go-zookeeper 218e9c81c0dd8b3b18172b2bbfad92cc7d6db55f
-github.com/shirou/gopsutil 1de1357e7737a536c7f4ff6be7bd27977db4d2cb
+github.com/shirou/gopsutil 1f32ce1bb380845be7f5d174ac641a2c592c0c42
 github.com/soniah/gosnmp b1b4f885b12c5dcbd021c5cee1c904110de6db7d
 github.com/streadway/amqp b4f3ceab0337f013208d31348b578d83c0064744
-github.com/stretchr/objx 1a9d0bb9f541897e62256577b352fdbc1fb4fd94
 github.com/stretchr/testify 1f4a1643a57e798696635ea4c126e9127adb7d3c
 github.com/wvanbergen/kafka 1a8639a45164fcc245d5c7b4bd3ccfbd1a0ffbf3
 github.com/wvanbergen/kazoo-go 0f768712ae6f76454f987c3356177e138df258f8

circle.yml

@@ -4,9 +4,9 @@ machine:
   post:
     - sudo service zookeeper stop
     - go version
-    - go version | grep 1.5.3 || sudo rm -rf /usr/local/go
+    - go version | grep 1.6 || sudo rm -rf /usr/local/go
-    - wget https://storage.googleapis.com/golang/go1.5.3.linux-amd64.tar.gz
+    - wget https://storage.googleapis.com/golang/go1.6.linux-amd64.tar.gz
-    - sudo tar -C /usr/local -xzf go1.5.3.linux-amd64.tar.gz
+    - sudo tar -C /usr/local -xzf go1.6.linux-amd64.tar.gz
     - go version
 
 dependencies:

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()

plugins/inputs/zfs/zfs_test.go

@@ -212,22 +212,22 @@ func TestZfsGeneratesMetrics(t *testing.T) {
 	}
 
 	z = &Zfs{KstatPath: testKstatPath}
-	acc = testutil.Accumulator{}
+	acc2 := testutil.Accumulator{}
-	err = z.Gather(&acc)
+	err = z.Gather(&acc2)
 	require.NoError(t, err)
 
-	acc.AssertContainsTaggedFields(t, "zfs", intMetrics, tags)
+	acc2.AssertContainsTaggedFields(t, "zfs", intMetrics, tags)
-	acc.Metrics = nil
+	acc2.Metrics = nil
 
 	intMetrics = getKstatMetricsArcOnly()
 
 	//two pools, one metric
 	z = &Zfs{KstatPath: testKstatPath, KstatMetrics: []string{"arcstats"}}
-	acc = testutil.Accumulator{}
+	acc3 := testutil.Accumulator{}
-	err = z.Gather(&acc)
+	err = z.Gather(&acc3)
 	require.NoError(t, err)
 
-	acc.AssertContainsTaggedFields(t, "zfs", intMetrics, tags)
+	acc3.AssertContainsTaggedFields(t, "zfs", intMetrics, tags)
 
 	err = os.RemoveAll(os.TempDir() + "/telegraf")
 	require.NoError(t, err)

plugins/outputs/influxdb/README.md

@@ -2,7 +2,7 @@
 
 This plugin writes to [InfluxDB](https://www.influxdb.com) via HTTP or UDP.
 
-Required parameters:
+### Required parameters:
 
 * `urls`: List of strings, this is for InfluxDB clustering
 support. On each flush interval, Telegraf will randomly choose one of the urls
@@ -10,3 +10,17 @@ to write to. Each URL should start with either `http://` or `udp://`
 * `database`: The name of the database to write to.
 
 
+### Optional parameters:
+
+* `retention_policy`:  Retention policy to write to.
+* `precision`: Precision of writes, valid values are "ns", "us" (or "µs"), "ms", "s", "m", "h". note: using "s" precision greatly improves InfluxDB compression.
+* `timeout`: Write timeout (for the InfluxDB client), formatted as a string. If not provided, will default to 5s. 0s means no timeout (not recommended).
+* `username`: Username for influxdb
+* `password`: Password for influxdb
+* `user_agent`:  Set the user agent for HTTP POSTs (can be useful for log differentiation)
+* `udp_payload`: Set UDP payload size, defaults to InfluxDB UDP Client default (512 bytes)
+  ## Optional SSL Config
+* `ssl_ca`: SSL CA
+* `ssl_cert`: SSL CERT
+* `ssl_key`: SSL key
+* `insecure_skip_verify`: Use SSL but skip chain & host verification (default: false)

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() {
+		var labels []string
-			if len(k) > 0 {
-				labels = append(labels, k)
-			}
-		}
-
 		l := prometheus.Labels{}
-		for tk, tv := range point.Tags() {
+		for k, v := range point.Tags() {
-			l[tk] = tv
+			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) {